Moved interfaces
adapted usage