Avoid @codeCoverageIgnore annotations
Add PrimitiveModel, return primitives from command