Added smart TODO for self