added workspace support