FLUID-5466: Adding the rest of the options