CDB-1306 properly hooked the validator everywhere, removed map instance as is not needed at ruby side