Updates for OAC functionality with regards to 2-level repo hierarchy.