Closes #14 Fixing metadata collection