Added better cask support