Add afterLoad for good