Change interface a little