Completed work on Security changes.