Simplifying the interface a bit more