Id Rather have this more typesafe or with validation