Fully updated API