Refactor + mapping system is no more static.