Added support for more sql type