Added support for length module