Add validatin and validation feedback