Updated Application and framework