Add Wraps to base.py decorators