Added single module mode