Changed to use the new App base instead of the deprecated Application