Updated with v16 information.