Removed unneeded group.
Added aggregation of files and encoding support.