Better ADO model repo implementation changes.
Bug fixes.