[WIP] Dropping NodeAttrs from the injectable services

This is PR is currently in an early stage and will be subject to change