OAK-377
Changed method names and signature.