Updated model classes to coincide with config module.