Made interface more consistent