Fixed Extended Entity Properties persistence