Adding CE, CSN as parameters to Station, Master and Generic. Fixing
warnings.