Added ZIP support and file-set exclusions