Added Craft 2.3 support