Adjust DB structure and output for PCT