Moving code aroud in dawaPgApi for readability