Added option for multiple flavours