Added EA v.10 support