Added missing Application.java + minor improvements