Made more secure