More entity draft updates