Added Type Validation