Added validation in controls