Added some refactorings for the Kepler release of Eclipse