Refactoring to replace Resource with Bindable