Plug potential listener leak
Add in-container Transaction impl