Clean up the OMS API a little bit and also integration beginnings of pagination