Added properties/members and updated constructors