Update security component system
Some correction and addons