Added TBAControlByTPA + fix for TPAControlSegment