Added a bit more to the interface