Added configuration and argument processing