Currently many class implement the interfaces separatly. This should be consolidated.
Currently many class implement the interfaces separatly. This should be consolidated.