Fix pattern to allow for extraction of more generic agoness