Added GP model and addition user fields required for demo.