Addind security and some other things