Add flavours back (still some bugs there)