- Refactoring to defining a listener on request or exception
- Added layout parameter with compiler pass