Added type enforcement