Record class added (i expect a lot of conflict)