Changed from command to mapping to domain models