Added staging support (down data partially tested - TODO test properly)