Added type and string formatting.