Fixed findbugs errors
Made Identity serializable so that we can persist as part of the session context.