Address params logic now extracted to a method