Adding inline links support