Issue #216 Fixed validations and conventions