Added calc mixin