made slight api changes since we need our entity getter for everything.