Add debugs in handlers