Added support for adapter versions 2.X, enhanced Makefiles