Changes to improve performance for workspace