Add login support
Update TODO