Reworked task routes to resources