Updated session messages and added types to main file