Addded 1.0 and DefaultQuery schemas.
Merge origin/master