Added staging option