Created handler for data
Merge branch 'data'