Adding in some whenever configs