Almost ready with editing schema