Updates:

Model implementation update