Added more properties