FEATURE: Only record states within workspace