Changes the signatures (WIP: middleware, lack of time :/)