Made the interface more useful