Organize imports
OVT-7983: Add code's value to response