EZP-21961: Added missing types