Improve maps used to run specs