Added download module + moved element_pre_handler