Modified base presenter and tube to work with the new wrapper