Add events categiries & types to session, fix problems with model constructors