Adding max lenght and non empty restrictions