Add mode to return @ instead of None