Updated spec, updated workspace saving to use new spec