Switch to embedded model struct