Changed to included additional metadata