More improvements to the interface