Cleanups and flattening callback chain
Adding needed response values