Updated model to include properties for clarifications