Add TODO to make configuration more flexible