Updates to include database initialisation