Added singular and plural types to component kind