Updated resources. Added mixins.