Equivalencies updates, resolves #62