Improve EE integration