Removed IUnit and moved methods in Unit