Added type information for easier handling