Added icehouse support