Updated scripts to reflect database
General improvements timing management