Can we conditionally add them based on waffle flag?