Merged with Modules instead of Type