Added more properties and some more methods.