Better solution for scoping model (publish / unpublish event)