Added concatenated modules support