Changes for integration with postgres plugin