Minor changes to convention model