Added more entity base goodness