Added more needed modules