Redone some classes/interfaces