Made handlers optional