feat(): adds whenever support with defaults