Added operator parsing