Use Identity type instead of UUID