Added use of current user session (#6)