[FEATURE] Improve workspace module performance

Change-Id: I81b6d924fd6e63ba7f5137cb65d6e0d3195519b5