Added some metadata including layout