NEW:
1. Add base to middleware