Updates to scoring and structure