Added ctag related stuff