Updated to match current API