Improved the preservation handling, the views, tests, etc.