added fluid classes