integrated changes on security components 0.2.1