Fixed mapping inconsistency and added some missing specs