Updated to allow object nodes