[vube] Consider optional fields and modernize