Derived props refactoring. No dynamic DP on model