Pass more metadata to layout