added dynamic modules support