Feature/configurable parameters 193