changed classes to implement Indentifiable