Fix a facory method implementation
Add mapping capabilities to SBRMapping