[TASK] Backward compatible and cleanup