Added dynamic configuration