Refactored to move data conversion into stock object.