#16 : Refactored Task & Resource Index