This is only meant to include the cases in which the property are optimized. Does not work yet for the dynamic component