Updated interfaces.
Fixed file collision.