added metadata dummy layout and some corrections