Readd e2 bbappend for oea
Optimize oea bbappends