Start to decouple baseline from refimpl