Added method to deal with workspace management