Added simple validation