Redid meteadata making it work across entities and items