Updates to App class