Fixed Mapper and Builder types