Rearchitecting way I do extended entity properties.