Update conventions further