For #342 - updates validation in internals