Updated sleep/upkeep to use facet values instead of multiple aspects