Feature/parameterized functions