Added basic validation options