Add method to wrap node without a parent
Minor: refactor with generics and final