Make it possible to call just signal or just bundle