Add shared_handler