Updated to work with CMSSW_5_3_11