Refactor round adding code into database.inc file.