WIP: Update to use direct deps. instead of peer deps.

Fix SLN-1055
Fix SLN-1057