Modified for Mantid API v2