Update app and add Matt service for server