Use the new catalog api, with name as workspace sub node
Merge pull request #262 from nicolas-f/fix/mapcatalog-api-change

Use the new catalog api, with name as workspace sub node