Updated basic objects and mixins.