Removed previous type checking