Partially improved with some derived attributes. Problem expanding array columns.