Updated the smartgrid predicates to be more specific.