v2.0 Added configuration settings