Added configurable parameters