New changes towards Springifying the app