Added documentation
More consistent parameter names for related mixins