Refactored to abstract the data