Added mixin, updated clone