Added new class CSP