More refactorings for remote drawables support