Added default values
When target is not created, create automatically new one