More changes to make this work with the new omnibus