Updated interface a bit.