Implement API changes, futher testing