Complete command parsing added