Change workspace constructors to make more sense
merge