Updated to add configuration options