Add base Mapper class with updated @context mapping