Updates to generic types on Enrichers for Jenkins build