Added configuration arguments