Make feed locks internal, expand locking in .index()