Fixing scenario where models don't have annotation