More layer and namespace changes