Prevent duplicate listing by using containable

Closes #9