Added result schema and stuff