Keeping file layout.
Updating database functions.