some changes for new CS api - fixed validations