Changed interface a bit