Changed Application class to be more configurable