Begin refactoring for node 0.10