Trait and @PropertyReactive performance improvements