Changes to entities. File framework in place.