introducing type id's for making things maintainable - Bugfix