Initial commmit with CJ attachment extension support.