update API to new architecture