Make entry_id field not nullable