Config design changes;