Small Model changes