Protect 'clone' keyword
Added -D flag support