Fix base helpers to allow for granularity