WOrk on model context definition