Refactored models, views. New blocking mechanism