Refactor storage of claimed interfaces