Added support for swimming