Added missing types and properties