Modified the first patch to also create the database