Add extra todos regarding placeholder validation