Update to sync with latest dev of Omega