Added missing class properties