Fixing API interface