Added validation and partials