Added custom type definitions