Updating blocks to use ModuleTouchListener and return it accordingly