Further updates to model layer.