Added intance classes for each component type