Feature/new interface