Fix exception
Add identifier
Updated on compatability