Interfaces added. Outer dependencies deleted.