Data layer updates
Merge branch 'master' of github.com:evkap/hcktn