Added types, UUIDField supported