Updated App class