Mapping of commands bit more complete