Add Lexical coping & variable safety