Added type-guide