Handlers are now more secure