Added support for groups; fixed timestamp issue