Created a project for Specs
Fixed some issues with mapping