Added Str type to sub signatures