Modified interface a bit