Some TODO for next implementations