Added capability to automatically define artifact (no need to do it manually)