Merge "Add internal classes to models-pdp"