Added possibility to group entries.