Removed ImageLoader and TypeEnum