[TASK] Update to respect interface