Add hint and deviceid requests
Refactor maybe