BAP-164 - Replace deprecated methods