More refactoring
- Store mapping back to workspace project id