Make it more secure