Entities moved to Core