Reworking legacy support infrastructure