Refactor features message classes.