Added macros for populating the command field