Updated configuration
WIP
Cleanup