Updated to latest omnibus syntax and usage