Add nicer interface