Change schemas for ompatibility with RFC