Some classes are becoming useless. Added Arrow and improved Pipe