New code structure in Models component