Added missing types and documentation