Reused GENMEssage , organised imports