Addded very primitive security handling