Updated core and entity API