Refactoring into conv. classes.