Added some properties and methods