Added workspace mappings
adding saving workspace to final