Updated data model

Includes letters and numbers