Updates to ensure improved command parsing abstractions.