Added missing types