added custom workspace support