Added basic validation setup