synced with new app schema & migrations