Added some more convention automation.