- Restructured model to account for item extras more robustly