Updated App and Config