Added missing modules