Updated Model Code