Added on_load event handler
Now use async event handlers