Working on improved schema write/parse