massive modules & components update