Improve watch command