First changes for M3 library changes