Change database type & minor update