adapted bindings and model to new schema