Added Compost support