Added workshops model
Workshop details updated
Resolved workshop conflict