Entities further defined, saving of configuration implemented.