Add groups
Better handling of load problems
Fix new elements