Split out different definition types