TODO remoAdd override in builder + tests.