Genericized Module types and removed debugging
Genericized Module types