Updates to include DB import