Use mapping to define comamnds pages
Adjust specs