Internationalized everything I have; Added validation