Switching to session variables (Javadoc updates)