Major model and logic updates