IdMapper refactoring to properly use FieldContainer