Added validation part