Added files from APR CW