API - Last steps