Updated base application