Changed structure in the fluid module