refactored lang, and imageuploader support