Adding stronger validation