updated annotation loaders