Releasing 2.2. - Little refactors