Modernise the interface a bit