Added message types
Added option to auto connect