Change to data model for labels
Merge pull request #17 from mlcrazy/charlabels

Change to data model for labels