Reduced db calls by 25%