Added enhanced id generators to 'Mapping by code'