Add type property to all modifiers and  clean up eclipse warnings(raw type references and serialization UIDs)