LPS-47261 SF - Making method generic