Add more user safeguards