Add mappers & advice generator