Fix broken API
Add wildcard for OreDictionary where appropriate