Add naive context implementation, model changes and util file