Added calc mixing and selection mixin