Added message parsing