Updated for SilverStripe 3.1