Added some conventions