Some more work on Application.php