User managment and refactored config managment