Modified to accept additional tags as options