#270 - Fixed method signature to pass only required information