Updated extended model implementation with new code