Added support for piki and AccuJazz