Refactor @Parser annotation