Add some conventions