Added some methods to the main entities