Core patch for entities