Moved entity utils to static inner classes.