Updated app schema and implementation