Added few properties and methods