Cleanup, new placeholder interface
Added classes for liquids