Updated handling of ComponentType message
Minor bugfix
Initial commit
Minor changes