Added basic validation