A few more missing namespace declarations
Only use postgresql if available