added include file
added better handling of extended types based on the config file