Make URLs optional
Add some primary key restrictions