Added Support for MariaDB and PostgreSQL