Added Water support (WORK IN PROGRESS)