Migrated to new app stack