Changed analysis model from one-to-many to one-to-one relations. Changed templates to match new model.