Removed duplicate validation