Added scan response; partially tested