TypeNormaliserFactory lookup refacotred
Merge branch 'type-normaliser-factory-refactor'