Added ability to resolve abbreviated genera