Add metadata to entries this closes #12