Modified app functionality to work with appframework 2.0