Added module mode