Added security funcs