Changed mixins.py and added decorators.py