Changed return type of visitor