Ticket #11: Adding eligible metadata