Took out circular reference keys