Use manager instead of session

Seems safer/better (also used by the facade). Should fix #31