WIP - updating common validation codes