More workspace stuff for beta.