Replaced last couple of references to entities and replaced them with references to the proper interfaces