Adding support for collection values
Flipping an if
Adding support for classes to Node