Model refactory