Revamp Kopi.parse to be more robust
Parse water as well