Updated Commonlib loader