Updated in according to API changes