Added SOIL support