Added missing type method and bug fixes