Updated as much as possible without changing Entities