Update to 2.7, provide better names, new mixin