Added scoped events and property defaults