Added type retrieval