More work on the application base