Added basic field validation