update to use component scanning, injected sessions