Version bump (will be a conflict later)
Separate reader for drawables, and just say no to singletons