Last changes before switching over to new tables