moved all references into one object