Updating code to work with the latest API
Adding labels