Updates to conform to API