Added enforce_extra = 'omit' option