Add support for Amherst