added UUID fields to models