Added (untested) level support