Updated cspp_base to not use kwargs and modified regex's to support more variations.