Convert "sink" to the new infrastructure