Just changed fluid utils and corresponding classes.