Added the ElementType on the classes