Added Javadoc and increased session-timeout