Add better ctag support