Add some text specific mappings and better javascript support