added baseline manifest and some further enhancement for the postgres handling