Added configuration, fixed arguments