Rename structure, added security code
errors