More changes to custom commands