Added Advanced care planning and updated to version 7