Extract Model to a separate module