Extract model to a separate module