Simplified the interface a bit