Make handlers async only