Updated to use generics methods from PMDx.