Fix missing file from previous commit
Added validation of attribute key length