Adding proper model destruction and eventing