Still fixing the merge with abstract types