Add workshop field in models
Merge individual workshop code