Yeah, I generally prefer singular form, as the core concepts are singular