Separated validation into own workspace