Made it compatible to Propel2 alpha 3.