Added the unit interface
Fixed the abstract classes imports