Add more defaults when not set
make configuration not required