Adds better ctag support