More refactorings pursuing remote drawable support