Additional Psql support
Merged and fixed
Update stratum AOIs