Using InputComponent to unwrapper and added more assertions