feature/IN-656: Improvement to method signature.