Changes to custom_commands