update to core and entity