Improve OAC sync code

Get some more data into the collections when loaded