Added configuration parameters and additional tasks