Update reference and config handler