Changes done from Eclipse Kepler