Updated Verba Class to be based on API updates