More changes to concepts