Abstract Mapper update fixed