Second round of changes
Third phase (db change)