Updated level handling