Dominic: api reorganisation