Added insert statements and modified constraints