Changed to CD Model Objects