Updated the framework of ELocalDefs