modified ModelDataBuilder and added initial GP stuff