Updating to have Configuration options