Basic interfaces
Revert "Basic interfaces"

This reverts commit 911442f0573805c0d9e15b005deb0f346e7f8312.
Basic interfaces 2