More changes to adhere to architecture discussion