Added dispatcher, properties, controller