Address review comments: missing type
Merge pull request #1519 from ussuri/new-workspace-methods

Address review comments for #1518