Refacor levelup support