Support staging properly