Updating ABH 1.6.5 with new classes