sink_id function definitions moved to the upgradable part of code