Added OptionFoldable and TreeFoldable