Added smart option for ox