Switched back to using the proper node types