Implemented review comments related to metadata option