Added initial validation