Added more application changes