Refactored the report creation command.