Added support for water shield