Add the guard function
Update metadata things