Adding configurability