Add type safe entity loader