Add support for run type specific references