Refactored List to be a wrapper around a record