Refactoring a bit more
Finishing the config and permission nodes