Added more public properties