improved configurability