added basic configurability