Added Buggalo support