Modify to extend ABS classes