Added mixins + more utilities + several other changes