Added some updates to CreateDatabase and update