update for handler parsing