Loading handlers updated