[WIP] AOP on Eel

Change-Id: I988deab476ef054747e7a8f69afa49ffe1ede3dd