Finish contains + add hasFields