CDB-3138 Added additional specs and validations