Workspace Issue - Resolved

It is still not streamlined with other JS code. Will improve in next commits.