Updated to reflect cleaned up class hierarchy in SWRLAPI