Fix issue with uncloseble is
Implement metadata