Fix #22 - Replace removed modules