Add support for Bartender