Create better experience when possible to add both types