A little clean up
Refactor ContactTypes to follow 'plugin model', no longer just simple enum