A few updates to make API easier to use