Added support for creating UserIds on the fly. Also, updated some logic for better zip handling