Removed dependency on :body-keys transformation
More modifications of curly to use tree data