Fix Core Functions (Create,duplicate)