Fix address parts. Create spec for message class