Extending Aquamist capability