More prepping for entities