Added support for the Baster