Added Water Support (WORK IN PROGRESS)