Big update preparations

Back end changes.
Revert "Big update preparations"

This reverts commit 8bcf8d2df9104a2541adc4b4938ae6ad045b6f62.