Fix memory leak
Update metadata