Adds support for 'repair_taps' declarative