Refactoring to deal with new extraInfo field