Bring structure more related to artifact search