Added extra notice + removed invalid primary key