Item #98 - Add support for postgresql