Moving to M4 scala version