Moved model saving to separate task.  Trigger model saving from events
Add skill related objects