Added count, defaultIfEmpty and defer