-- Adding support for MySql Database
-- Fix some bugs