Updated to better reflect current API