Added level handling