Minor update
Add support for enforcing node by index