Replaced marked attribute of Vector with group attributes.
added 1 new configuration and renamed an old one
a lot of small changes.