Updated model and documentation