Moved interface into package