Move handler as global like in