Updates to AP5 for loading into ABCLv1.9.0