Split to utils. Add global liquid check option