Fix mandatory primary key
Remove SplObjectStorage