Added index and update methods