Model number refactor