Improved role hierarchy
Renamed some node methods