diff --git a/.env.example b/.env.example
index 03a7b376..0e2a83b2 100644
--- a/.env.example
+++ b/.env.example
@@ -13,6 +13,7 @@ APP_HASH_SALT_ITEM=
 APP_HASH_SALT_ITEM_CATEGORY=
 APP_HASH_SALT_ITEM_SUBCATEGORY=
 APP_HASH_SALT_ITEM_TYPE=
+APP_HASH_SALT_PERMITTED_USER=
 
 LOG_CHANNEL=stack
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fae9a688..3834db1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,44 @@
 
 The complete changelog for the Costs to Expect REST API, follows the format defined at https://keepachangelog.com/en/1.0.0/
 
+## [v2.04.0] - 2019-11-xx
+### Added
+- We have added a GitHub callout to the top right corner of the API landing page, courtesy of https://github.com/tholman/github-corners.
+
+### Changed
+- We have updated the code to ensure the data arrays in the config files get used whenever possible; minor data arrays for parameters defined in two locations.
+- We have added additional summary models.
+- We have moved the item and resource type item models, now organised by namespace, not the class filename.
+- We have moved the item and resource type item transformers, now organised by namespace, not the class filename.
+- We have moved all the `existsToUser` methods out of the `item` models and into a `PermittedUser` model.
+- We have updated the `item` and `resource type item` summary routes; they respect the chosen resource type (Allocated expenses and Simple expenses) and provide the relevant summary.
+
+### Fixed
+- We have corrected several more class names, incorrect capitalisation.
+
+## [v2.03.0] - 2019-10-27
+### Added
+- We have added a new route, `item-types`, the route shows the item types supported by the API.
+
+### Changed
+- We have updated the landing page; the focus was previously on the website; the API is the backbone of the entire service; the site is ancillary.
+- We have moved the summary controllers; we should use namespaces to organise the code, not filenames.
+- We have moved the summary transformers; we should use namespaces to organise the code, not filenames.
+- We have started to move the summary models; we should use namespaces to organise the code, not filenames.
+- We have merged the authorised and general API routes section, the README details the API routes and the API summary routes in two tables.
+- We have moved some configuration files. We thought it was odd how some were outside of folders; additionally, config files should only be in folders if there can be multiple files for the 'section'.
+- We have moved localisation files to match their config partners.
+- We have updated the allowed values for the `year` GET parameter; we derive the values from the data; the limit for Jack should be 2013 to 2019, for Niall te limit should be 2019.
+- We have updated the GET parameter validator; supplied values validated against values defined in the OPTIONS request.
+
+### Fixed
+- We have corrected the category summary routes in the README.
+- We have corrected the name of a few transformers, incorrect capitalisation.
+- We have corrected the name of a few controllers, incorrect capitalisation.
+- We have set the salt for the item type hasher.
+- For uncaught exceptions, we return the trace when the API is in development mode.
+- We have updated the code to generate conditional GET parameters; the item type defines which parameters exist.
+
 ## [v2.02.0] - 2019-10-07
 ### Added
 - We have updated the create resource type route. It is now possible to set the item type that you want to use. There are two expense types, "allocated expense" and "simple expense". An allocated expense allows you to allocated a percentage of the total cost; a simple expense only has a total, no allocation rate.
diff --git a/README.md b/README.md
index 5eed9c3a..4620c9fc 100644
--- a/README.md
+++ b/README.md
@@ -2,28 +2,12 @@
 
 ## Overview
 
-What does it cost to raise a child in the UK?
+Costs to Expect is a service which focuses on tracking and forecasting expenses. 
+The Costs to Expect API is the backbone of the service and is not going to be 
+limited to expenses; however, we figured that is was an excellent place to start. 
 
-[Costs to Expect](https://www.costs-to-expect.com) is a long-term personal project, my wife and I are tracking 
-the expenses to raise our children to, adulthood, 18.
-
-### Why?
-
-There are two core reasons as to why we are doing this. I love data, and over the last twenty years, 
-it appears to have become accepted knowledge that it costs £250k to raise a child in the UK. 
-
-If you think about the number, it becomes apparent quickly that it can't be right, on average over 
-£10k a year?
-
-This API will show the costs to raise our children; obviously, every family is different, these costs only 
-relate to our family, more details will appear on [Costs to Expect](https://www.costs-to-expect.com) as development 
-on the site continues.
-
-## The API
-
-This Laravel app is the RESTful API for the [Costs to Expect](https://www.costs-to-expect.com) service, 
-the API will be consumed by the [Costs to Expect](https://www.costs-to-expect.com) website and the iOS app which 
-I'm creating to assist my wife with data input.
+A small part of the service is tracking the costs to raise a child in the UK, 
+more detail can be found at [Costs to Expect](https://www.costs-to-expect.com).
 
 ## Set up
 
@@ -61,7 +45,7 @@ you will also need to set `MAIL_FROM_ADDRESS` and `MAIL_TO_ADDRESS`. You may nee
 
 ## Responses
 
-* Collections will return an array and 200.
+* Collections will return an array and a 200.
 * Items will return a single object and a 200.
 * Successful POST requests will return a single object and a 201.
 * Successful PATCH requests will return 204.
@@ -71,7 +55,8 @@ case of a validation error, 422, the fields array will contain the validation er
 
 ## Headers
 
-Response will include multiple headers, the table details the purpose behind each header.
+Responses will include multiple headers, the table details the purpose behind some of the 
+custom headers.
 
 | Header | Purpose |
 | :--- | :--- |
@@ -87,52 +72,89 @@ Response will include multiple headers, the table details the purpose behind eac
 | X-Search | Search options applied to request after validation |
 | X-Parameters | Request parameters applied to request after validation |
 
-## Data routes
+## Routes
+
+Access to a route will be limited based upon your permitted resource types. When you 
+create a resource type you have full access to everything below, additionally, the same 
+is true if you are assigned to a resource type.
 
 | HTTP Verb(s) | Route |
 | :--- | :--- |
 | GET/HEAD | v2/ |
 | OPTIONS  | v2/ | 
 | POST     | v2/auth/login |
-| POST     | v2/auth/register (Removed in production) |
+| POST     | v2/auth/register  |
+| GET/HEAD | v2/auth/user |
+| GET/HEAD | v2/changelog |
+| OPTIONS  | v2/changelog |
+| GET/HEAD | v2/item-types |
+| OPTIONS  | v2/item-types |
+| GET/HEAD | v2/item-types/{item_type_id} |
+| OPTIONS  | v2/item-types/{item_type_id} |
 | GET/HEAD | v2/resource-types |
 | OPTIONS  | v2/resource-types |
+| POST     | v2/resource-types |
 | GET/HEAD | v2/resource-types/{resource_type_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id} |
+| PATCH    | v2/resource-types/{resource_type_id} |
+| DELETE   | v2/resource-types/{resource_type_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/categories |
 | OPTIONS  | v2/resource-types/{resource_type_id}/categories |
+| POST     | v2/resource-types/{resource_type_id}/categories |
+| PATCH    | v2/resource-types/{resource_type_id}/categories/{category_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/categories/{category_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/categories/{category_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories |
 | OPTIONS  | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories |
+| POST     | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories |
 | GET/HEAD | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} |
+| PATCH    | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/categories/{category_id}/subcategories/{subcategory_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/items |
 | OPTIONS  | v2/resource-types/{resource_type_id}/items |
+| OPTIONS  | v2/resource-types/{resource_type_id}/permitted-users |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources |
+| POST     | v2/resource-types/{resource_type_id}/resources |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id} |
+| PATCH    | v2/resource-types/{resource_type_id}/resources/{resource_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
+| PATCH    | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category |
 | GET/HEAD | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id} |
+| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category/{item_subcategory_id} |
 | OPTIONS  | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer |
+| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer |
+| GET/HEAD | v2/request/error-log |
+| OPTIONS  | v2/request/error-log |
+| POST     | v2/request/error-log |
+| GET/HEAD | v2/request/access-log |
+| OPTIONS  | v2/request/access-log |
 
 ## Summary routes
 
-Eventually there will be a summary route for every API GET endpoint, until that point, the summary routes 
-are detailed below. Some use GET parameters to breakdown the data, one example being items 
-which allows you to provide year, month, category and subcategory. A summary route should have the same 
-GET parameters as the non summary route.
+Eventually, there will be a summary route for every API GET endpoint. Until that point, the summary routes 
+that exists are detailed below. Some use GET parameters to breakdown the data, one example being 
+`v2/summary/resource-types/{resource_type_id}/items`. Review the OPTIONS request for each summary 
+route to see the supported parameters, these should largely match the non summary route.
 
 | HTTP Verb(s) | Route |
 | :--- | :--- |
@@ -150,43 +172,3 @@ GET parameters as the non summary route.
 | OPTIONS  | v2/summary/resource-types/{resource_type_id}/resources |
 | GET/HEAD | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items |
 | OPTIONS  | v2/summary/resource-types/{resource_type_id}/resources/{resource_id}/items |
-
-## Misc routes
-
-| HTTP Verb(s) | Route |
-| :--- | :--- |
-| GET/HEAD | v2/changelog |
-| OPTIONS  | v2/changelog |
-| GET/HEAD | v2/request/error-log |
-| OPTIONS  | v2/request/error-log |
-| POST     | v2/request/error-log |
-| GET/HEAD | v2/request/access-log |
-| OPTIONS  | v2/request/access-log |
-
-## Private routes
-
-These routes require authorisation.
-
-| HTTP Verb(s) | Route |
-| :--- | :--- |
-| GET/HEAD | v2/auth/user |
-| POST     | v2/categories |
-| PATCH    | v2/categories/{category_id} |
-| DELETE   | v2/categories/{category_id} |
-| POST     | v2/categories/{category_id}/subcategories |
-| PATCH    | v2/categories/{category_id}/subcategories/{subcategory_id} |
-| DELETE   | v2/categories/{category_id}/subcategories/{subcategory_id} |
-| POST     | v2/resource-types |
-| PATCH    | v2/resource-types/{resource_type_id} |
-| DELETE   | v2/resource-types/{resource_type_id} |
-| POST     | v2/resource-types/{resource_type_id}/resources |
-| PATCH    | v2/resource-types/{resource_type_id}/resources/{resource_id} |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id} |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items |
-| PATCH    | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id} |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id} |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category |
-| DELETE   | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/sub_category/{item_subcategory_id} |
-| POST     | v2/resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/transfer |
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 68dedef7..03869da8 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -52,22 +52,7 @@ public function report(Exception $exception)
     public function render($request, Exception $exception)
     {
         if ($exception instanceof AuthenticationException) {
-            if (App::environment() === 'local') {
-                return response()->json(
-                    [
-                        'message' => 'Unauthenticated',
-                        'trace' => $exception->getTraceAsString()
-                    ],
-                    403
-                );
-            } else {
-                return response()->json(
-                    [
-                        'message' => trans('responses.authentication-required')
-                    ],
-                    403
-                );
-            }
+            Response::authenticationRequired();
         }
 
         $status_code = 500;
@@ -79,16 +64,10 @@ public function render($request, Exception $exception)
 
         switch ($status_code) {
             case 404:
-                Response::notFound();
+                Response::notFound($exception);
                 break;
             case 503:
-                response()->json(
-                    [
-                        'message' => trans('responses.maintenance')
-                    ],
-                    503
-                )->send();
-                exit;
+                Response::maintenance();
                 break;
             case 500:
                 if (App::environment() === 'local') {
@@ -129,12 +108,14 @@ public function render($request, Exception $exception)
                 break;
         }
 
-        return response()->json(
-            [
-                'message' => $message,
-                'trace' => $exception->getTraceAsString()
-            ],
-            $status_code
-        );
+        $response = [
+            'message' => $message
+        ];
+
+        if (App::environment() === 'local') {
+            $response['trace'] = $exception->getTraceAsString();
+        }
+
+        return response()->json($response, $status_code);
     }
 }
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 51f0aefa..8bc74232 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\SubCategory;
+use App\Models\Subcategory;
 use App\Option\Delete;
 use App\Option\Get;
 use App\Option\Patch;
@@ -51,7 +51,7 @@ public function index($resource_type_id): JsonResponse
             Config::get('api.category.searchable')
         );
 
-        $total = (new Category())->totalCount(
+        $total = (new Category())->total(
             (int) $resource_type_id,
             $this->permitted_resource_types,
             $this->include_public,
@@ -123,7 +123,7 @@ public function show($resource_type_id, $category_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $parameters = Parameters::fetch(['include-subcategories']);
+        $parameters = Parameters::fetch(array_keys(Config::get('api.category.parameters.item')));
 
         $category = (new Category)->single(
             (int) $resource_type_id,
@@ -139,7 +139,7 @@ public function show($resource_type_id, $category_id): JsonResponse
             array_key_exists('include-subcategories', $parameters) === true &&
             $parameters['include-subcategories'] === true
         ) {
-            $subcategories = (new SubCategory())->paginatedCollection(
+            $subcategories = (new Subcategory())->paginatedCollection(
                 (int) $resource_type_id,
                 (int) $category_id,
                 0,
@@ -313,7 +313,7 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.category'));
+            UtilityResponse::notFound(trans('entities.category'), $e);
         }
     }
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index e9e6d918..3d6b509e 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,11 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Item\AbstractItem;
-use App\Item\ItemFactory;
-use App\Models\PermittedUser;
+use App\Models\ResourceTypeAccess;
 use App\Utilities\Hash;
-use Exception;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller as BaseController;
@@ -42,11 +39,6 @@ class Controller extends BaseController
      */
     protected $allow_entire_collection = false;
 
-    /**
-     * @var AbstractItem
-     */
-    protected $item_interface = null;
-
     public function __construct()
     {
         $this->hash = new Hash();
@@ -62,7 +54,7 @@ protected function setHelperProperties()
     {
         if (auth()->guard('api')->check() === true && auth('api')->user() !== null) {
             $this->user_id = auth('api')->user()->id;
-            $this->permitted_resource_types = (new PermittedUser())->permittedResourceTypes($this->user_id);
+            $this->permitted_resource_types = (new ResourceTypeAccess())->permittedResourceTypes($this->user_id);
         }
 
         $this->include_public = true;
@@ -100,19 +92,4 @@ protected function optionsResponse(array $verbs, $http_status_code = 200): JsonR
         )->send();
         exit;
     }
-
-    /**
-     * Make a call to the item interface factory and set the relevant item
-     * interface
-     *
-     * @param integer $resource_type_id
-     */
-    protected function setItemInterface(int $resource_type_id)
-    {
-        try {
-            $this->item_interface = ItemFactory::getItemInterface($resource_type_id);
-        } catch (Exception $e) {
-            abort(500, $e->getMessage());
-        }
-    }
 }
diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index 9a983fca..b8e342aa 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 use SplFileObject;
 
 /**
@@ -27,8 +28,10 @@ public function index(Request $request)
     {
         $routes_to_display = array();
 
+        $config = Config::get('api.app.version');
+
         foreach (Route::getRoutes() as $route) {
-            if (starts_with($route->uri, Config::get('api.version.prefix') ) === true) {
+            if (Str::startsWith($route->uri, $config['prefix']) === true) {
                 if (isset($routes_to_display[$route->uri]['methods'])) {
                     $routes_to_display[$route->uri]['methods'] = array_merge(
                         $route->methods,
@@ -47,11 +50,11 @@ public function index(Request $request)
         return response()->json(
             [
                 'api' => [
-                    'version' => Config::get('api.version.version'),
-                    'prefix' => Config::get('api.version.prefix'),
-                    'release_date' => Config::get('api.version.release_date'),
-                    'changelog' => Config::get('api.version.changelog'),
-                    'readme' => Config::get('api.version.readme')
+                    'version' => $config['version'],
+                    'prefix' => $config['prefix'],
+                    'release_date' => $config['release_date'],
+                    'changelog' => $config['changelog'],
+                    'readme' => $config['readme']
                 ],
                 'routes' => $routes_to_display
             ],
diff --git a/app/Http/Controllers/ItemCategoryController.php b/app/Http/Controllers/ItemCategoryController.php
index fe618da4..f2234adf 100644
--- a/app/Http/Controllers/ItemCategoryController.php
+++ b/app/Http/Controllers/ItemCategoryController.php
@@ -358,7 +358,7 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.item-category'));
+            UtilityResponse::notFound(trans('entities.item-category'), $e);
         }
     }
 }
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index bf39f989..3a98f448 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Item\ItemInterfaceFactory;
 use App\Option\Delete;
 use App\Option\Get;
 use App\Option\Patch;
@@ -12,7 +13,7 @@
 use App\Validators\Request\Route;
 use App\Models\Category;
 use App\Models\Item;
-use App\Models\SubCategory;
+use App\Models\Subcategory;
 use App\Utilities\Pagination as UtilityPagination;
 use App\Utilities\Request as UtilityRequest;
 use App\Utilities\Response as UtilityResponse;
@@ -49,19 +50,18 @@ public function index(string $resource_type_id, string $resource_id): JsonRespon
             $this->permitted_resource_types,
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
         $parameters = Parameters::fetch(
-            array_merge(
-                array_keys(Config::get('api.item.parameters.collection')),
-                array_keys($this->item_interface->collectionParameters())
-            )
+            array_keys($item_interface->collectionParameters()),
+            (int) $resource_type_id,
+            (int) $resource_id
         );
 
-        $item_model = $this->item_interface->model();
+        $item_model = $item_interface->model();
 
         $search_parameters = SearchParameters::fetch(
-            $this->item_interface->searchParameters()
+            $item_interface->searchParameters()
         );
 
         $total = $item_model->totalCount(
@@ -72,7 +72,7 @@ public function index(string $resource_type_id, string $resource_id): JsonRespon
         );
 
         $sort_parameters = SortParameters::fetch(
-            $this->item_interface->sortParameters()
+            $item_interface->sortParameters()
         );
 
         $pagination = UtilityPagination::init(request()->path(), $total)
@@ -111,8 +111,8 @@ public function index(string $resource_type_id, string $resource_id): JsonRespon
 
         return response()->json(
             array_map(
-                function($item) {
-                    return $this->item_interface->transformer($item)->toArray();
+                function($item) use ($item_interface) {
+                    return $item_interface->transformer($item)->toArray();
                 },
                 $items
             ),
@@ -143,9 +143,9 @@ public function show(
             $this->permitted_resource_types
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
-        $item_model = $this->item_interface->model();
+        $item_model = $item_interface->model();
 
         $item = $item_model->single($resource_type_id, $resource_id, $item_id);
 
@@ -157,7 +157,7 @@ public function show(
         $headers->item();
 
         return response()->json(
-            $this->item_interface->transformer($item)->toArray(),
+            $item_interface->transformer($item)->toArray(),
             200,
             $headers->headers()
         );
@@ -182,7 +182,7 @@ public function optionsIndex(
             $this->permitted_resource_types,
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
         $permissions = RoutePermission::resource(
             $resource_type_id,
@@ -190,25 +190,25 @@ public function optionsIndex(
             $this->permitted_resource_types,
         );
 
-        $parameters = Parameters::fetch(
-            array_merge(
-                array_keys(Config::get('api.item.parameters.collection')),
-                array_keys($this->item_interface->collectionParameters())
-            )
+        $defined_parameters = Parameters::fetch(
+            array_keys($item_interface->collectionParameters()),
+            (int) $resource_type_id,
+            (int) $resource_id
         );
 
         $conditional_parameters = $this->conditionalParameters(
             $resource_type_id,
-            $parameters
+            $resource_id,
+            array_merge(
+                $item_interface->collectionParametersKeys(),
+                $defined_parameters
+            )
         );
 
         $get = Get::init()->
-            setSortable($this->item_interface->sortParametersConfig())->
-            setSearchable($this->item_interface->searchParametersConfig())->
-            setParameters(
-                $this->item_interface->collectionParametersConfig(),
-                true
-            )->
+            setSortable($item_interface->sortParametersConfig())->
+            setSearchable($item_interface->searchParametersConfig())->
+            setParameters($item_interface->collectionParametersConfig())->
             setConditionalParameters($conditional_parameters)->
             setPagination(true)->
             setAuthenticationStatus($permissions['view'])->
@@ -216,7 +216,7 @@ public function optionsIndex(
             option();
 
         $post = Post::init()->
-            setFields($this->item_interface->postFieldsConfig())->
+            setFields($item_interface->postFieldsConfig())->
             setDescription( 'route-descriptions.item_POST')->
             setAuthenticationRequired(true)->
             setAuthenticationStatus($permissions['manage'])->
@@ -257,9 +257,9 @@ public function optionsShow(
             $this->permitted_resource_types,
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
-        $item_model = $this->item_interface->model();
+        $item_model = $item_interface->model();
 
         $item = $item_model->single($resource_type_id, $resource_id, $item_id);
 
@@ -268,7 +268,7 @@ public function optionsShow(
         }
 
         $get = Get::init()->
-            setParameters($this->item_interface->showParametersConfig())->
+            setParameters($item_interface->showParametersConfig())->
             setAuthenticationStatus($permissions['view'])->
             setDescription('route-descriptions.item_GET_show')->
             option();
@@ -280,7 +280,7 @@ public function optionsShow(
             option();
 
         $patch = Patch::init()->
-            setFields($this->item_interface->postFieldsConfig())->
+            setFields($item_interface->postFieldsConfig())->
             setDescription('route-descriptions.item_PATCH')->
             setAuthenticationStatus($permissions['manage'])->
             setAuthenticationRequired(true)->
@@ -312,13 +312,13 @@ public function create(
             true
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
-        $validator_factory = $this->item_interface->validator();
+        $validator_factory = $item_interface->validator();
         $validator = $validator_factory->create();
         UtilityRequest::validateAndReturnErrors($validator);
 
-        $model = $this->item_interface->model();
+        $model = $item_interface->model();
 
         try {
             $item = new Item([
@@ -327,14 +327,14 @@ public function create(
             ]);
             $item->save();
 
-            $item_type = $this->item_interface->create((int) $item->id);
+            $item_type = $item_interface->create((int) $item->id);
 
         } catch (Exception $e) {
             UtilityResponse::failedToSaveModelForCreate();
         }
 
         return response()->json(
-            $this->item_interface->transformer($model->instanceToArray($item, $item_type))->toArray(),
+            $item_interface->transformer($model->instanceToArray($item, $item_type))->toArray(),
             201
         );
     }
@@ -362,18 +362,18 @@ public function update(
             true
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
 
         UtilityRequest::checkForEmptyPatch();
 
-        UtilityRequest::checkForInvalidFields($this->item_interface->patchableFields());
+        UtilityRequest::checkForInvalidFields($item_interface->patchableFields());
 
-        $validator_factory = $this->item_interface->validator();
+        $validator_factory = $item_interface->validator();
         $validator = $validator_factory->update();
         UtilityRequest::validateAndReturnErrors($validator);
 
         $item = (new Item())->instance($resource_type_id, $resource_id, $item_id);
-        $item_type = $this->item_interface->instance((int) $item_id);
+        $item_type = $item_interface->instance((int) $item_id);
 
         if ($item === null || $item_type === null) {
             UtilityResponse::failedToSelectModelForUpdate();
@@ -383,7 +383,7 @@ public function update(
             $item->updated_by = Auth::user()->id;
 
             if ($item->save() === true) {
-                $this->item_interface->update(request()->all(), $item_type);
+                $item_interface->update(request()->all(), $item_type);
             }
         } catch (Exception $e) {
             UtilityResponse::failedToSaveModelForUpdate();
@@ -414,8 +414,9 @@ public function delete(
             true
         );
 
-        $this->setItemInterface($resource_type_id);
-        $item_model = $this->item_interface->model();
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
+
+        $item_model = $item_interface->model();
 
         $item_type = $item_model->instance($item_id);
         $item = (new Item())->instance($resource_type_id, $resource_id, $item_id);
@@ -432,81 +433,109 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.item'));
+            UtilityResponse::notFound(trans('entities.item'), $e);
         }
     }
 
     /**
-     * Set any conditional GET parameters, these will be merged with the data arrays defined in
-     * config/api/[item-type]/parameters.php
+     * Set the allowed values for any conditional parameters, these will be
+     * merged with the data arrays defined in config/api/[item-type]/parameters.php
+     *
+     * Checks to see if a parameter requiring conditional values exists, if it
+     * does, populate the values
      *
      * @param integer $resource_type_id
-     * @param array $parameters
+     * @param integer $resource_id
+     * @param array $parameters Merged array of definable parameters and any
+     * set values
      *
      * @return array
      */
     private function conditionalParameters(
         int $resource_type_id,
+        int $resource_id,
         array $parameters
     ): array
     {
-        $conditional_parameters = [
-            'year' => [
-                'allowed_values' => []
-            ],
-            'month' => [
-                'allowed_values' => []
-            ],
-            'category' => [
-                'allowed_values' => []
-            ]
-        ];
-
-        for ($i=2013; $i <= intval(date('Y')); $i++) {
-            $conditional_parameters['year']['allowed_values'][$i] = [
-                'value' => $i,
-                'name' => $i,
-                'description' => trans('item-type-allocated-expense/allowed-values.description-prefix-year') . $i
-            ];
+
+        $item_interface = ItemInterfaceFactory::item($resource_type_id);
+
+        $conditional_parameters = [];
+
+        if (array_key_exists('year', $parameters) === true) {
+            $conditional_parameters['year']['allowed_values'] = [];
+
+            for (
+                $i = $item_interface->conditionalParameterMinYear($resource_id);
+                $i <= $item_interface->conditionalParameterMaxYear($resource_id);
+                $i++
+            ) {
+                $conditional_parameters['year']['allowed_values'][$i] = [
+                    'value' => $i,
+                    'name' => $i,
+                    'description' => trans('item-type-' . $item_interface->type() .
+                            '/allowed-values.description-prefix-year') . $i
+                ];
+            }
         }
 
-        for ($i=1; $i < 13; $i++) {
-            $conditional_parameters['month']['allowed_values'][$i] = [
-                'value' => $i,
-                'name' => date("F", mktime(0, 0, 0, $i, 10)),
-                'description' => trans('item-type-allocated-expense/allowed-values.description-prefix-month') .
-                    date("F", mktime(0, 0, 0, $i, 1))
-            ];
+        if (array_key_exists('month', $parameters) === true) {
+            $conditional_parameters['month']['allowed_values'] = [];
+
+            for ($i=1; $i < 13; $i++) {
+                $conditional_parameters['month']['allowed_values'][$i] = [
+                    'value' => $i,
+                    'name' => date("F", mktime(0, 0, 0, $i, 10)),
+                    'description' => trans('item-type-' . $item_interface->type() .
+                        '/allowed-values.description-prefix-month') .
+                        date("F", mktime(0, 0, 0, $i, 1))
+                ];
+            }
         }
 
-        $categories = (new Category())->paginatedCollection(
-            $resource_type_id,
-            $this->permitted_resource_types,
-            $this->include_public,
-            0,
-            100
-        );
+        if (array_key_exists('category', $parameters) === true) {
+            $conditional_parameters['category']['allowed_values'] = [];
+
+            $categories = (new Category())->paginatedCollection(
+                $resource_type_id,
+                $this->permitted_resource_types,
+                $this->include_public,
+                0,
+                100
+            );
 
-        foreach ($categories as $category) {
-            $conditional_parameters['category']['allowed_values'][$this->hash->encode('category', $category['category_id'])] = [
-                'value' => $this->hash->encode('category', $category['category_id']),
-                'name' => $category['category_name'],
-                'description' => trans('item/allowed-values.description-prefix-category') .
-                    $category['category_name'] . trans('item/allowed-values.description-suffix-category')
-            ];
+            foreach ($categories as $category) {
+                $conditional_parameters['category']['allowed_values'][$this->hash->encode('category', $category['category_id'])] = [
+                    'value' => $this->hash->encode('category', $category['category_id']),
+                    'name' => $category['category_name'],
+                    'description' => trans('item-type-' . $item_interface->type() .
+                            '/allowed-values.description-prefix-category') .
+                        $category['category_name'] .
+                        trans('item-type-' . $item_interface->type() .
+                            '/allowed-values.description-suffix-category')
+                ];
+            }
         }
 
-        if (array_key_exists('category', $parameters) === true) {
+        if (
+            array_key_exists('category', $parameters) === true &&
+            $parameters['category'] !== null &&
+            array_key_exists('subcategory', $parameters) === true
+        ) {
+            $conditional_parameters['subcategory']['allowed_values'] = [];
 
-            $subcategories = (new SubCategory())->paginatedCollection($parameters['category']);
+            $subcategories = (new Subcategory())->paginatedCollection(
+                $resource_type_id,
+                $parameters['category']
+            );
 
             array_map(
-                function($subcategory) use (&$conditional_parameters) {
-                    $conditional_parameters['subcategory']['allowed_values'][$this->hash->encode('subcategory', $subcategory['id'])] = [
-                        'value' => $this->hash->encode('subcategory', $subcategory['id']),
-                        'name' => $subcategory['name'],
-                        'description' => trans('item/allowed-values.description-prefix-subcategory') .
-                            $subcategory['name'] . trans('item/allowed-values.description-suffix-subcategory')
+                function($subcategory) use (&$conditional_parameters, $item_interface) {
+                    $conditional_parameters['subcategory']['allowed_values'][$this->hash->encode('subcategory', $subcategory['subcategory_id'])] = [
+                        'value' => $this->hash->encode('subcategory', $subcategory['subcategory_id']),
+                        'name' => $subcategory['subcategory_name'],
+                        'description' => trans('item-type-' . $item_interface->type() . '/allowed-values.description-prefix-subcategory') .
+                            $subcategory['subcategory_name'] . trans('item-type-' . $item_interface->type() . '/allowed-values.description-suffix-subcategory')
                     ];
                 },
                 $subcategories
diff --git a/app/Http/Controllers/ItemSubCategoryController.php b/app/Http/Controllers/ItemSubcategoryController.php
similarity index 92%
rename from app/Http/Controllers/ItemSubCategoryController.php
rename to app/Http/Controllers/ItemSubcategoryController.php
index 46256164..293c2350 100644
--- a/app/Http/Controllers/ItemSubCategoryController.php
+++ b/app/Http/Controllers/ItemSubcategoryController.php
@@ -9,12 +9,12 @@
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Route;
 use App\Models\ItemCategory;
-use App\Models\ItemSubCategory;
-use App\Models\SubCategory;
-use App\Models\Transformers\ItemSubCategory as ItemSubCategoryTransformer;
+use App\Models\ItemSubcategory;
+use App\Models\Subcategory;
+use App\Models\Transformers\ItemSubcategory as ItemSubcategoryTransformer;
 use App\Utilities\Request as UtilityRequest;
 use App\Utilities\Response as UtilityResponse;
-use App\Validators\Request\Fields\ItemSubCategory as ItemSubCategoryValidator;
+use App\Validators\Request\Fields\ItemSubcategory as ItemSubcategoryValidator;
 use Exception;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
@@ -27,7 +27,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategoryController extends Controller
+class ItemSubcategoryController extends Controller
 {
     /**
      * Return the sub category assigned to an item
@@ -59,7 +59,7 @@ public function index(
             UtilityResponse::notFound(trans('entities.item-subcategory'));
         }
 
-        $item_sub_category = (new ItemSubCategory())->paginatedCollection(
+        $item_sub_category = (new ItemSubcategory())->paginatedCollection(
             $resource_type_id,
             $resource_id,
             $item_id,
@@ -75,7 +75,7 @@ public function index(
         $headers->add('X-Count', 1);
 
         return response()->json(
-            [(new ItemSubCategoryTransformer($item_sub_category[0]))->toArray()],
+            [(new ItemSubcategoryTransformer($item_sub_category[0]))->toArray()],
             200,
             $headers->headers()
         );
@@ -113,7 +113,7 @@ public function show(
             UtilityResponse::notFound(trans('entities.item-subcategory'));
         }
 
-        $item_sub_category = (new ItemSubCategory())->single(
+        $item_sub_category = (new ItemSubcategory())->single(
             $resource_type_id,
             $resource_id,
             $item_id,
@@ -129,7 +129,7 @@ public function show(
         $headers->item();
 
         return response()->json(
-            (new ItemSubCategoryTransformer($item_sub_category))->toArray(),
+            (new ItemSubcategoryTransformer($item_sub_category))->toArray(),
             200,
             $headers->headers()
         );
@@ -232,7 +232,7 @@ public function optionsShow(
             UtilityResponse::notFound(trans('entities.item-subcategory'));
         }
 
-        $item_sub_category = (new ItemSubCategory())->single(
+        $item_sub_category = (new ItemSubcategory())->single(
             $resource_type_id,
             $resource_id,
             $item_id,
@@ -297,7 +297,7 @@ public function create(
             ->where('item_id', '=', $item_id)
             ->find($item_category_id);
 
-        $validator = (new ItemSubCategoryValidator)->create(['category_id' => $item_category->category_id]);
+        $validator = (new ItemSubcategoryValidator)->create(['category_id' => $item_category->category_id]);
         UtilityRequest::validateAndReturnErrors(
             $validator,
             $this->conditionalPostParameters($item_category_id)
@@ -310,7 +310,7 @@ public function create(
                 UtilityResponse::unableToDecode();
             }
 
-            $item_sub_category = new ItemSubCategory([
+            $item_sub_category = new ItemSubcategory([
                 'item_category_id' => $item_category_id,
                 'sub_category_id' => $subcategory_id
             ]);
@@ -320,7 +320,7 @@ public function create(
         }
 
         return response()->json(
-            (new ItemSubCategoryTransformer((new ItemSubCategory())->instanceToArray($item_sub_category)))->toArray(),
+            (new ItemSubcategoryTransformer((new ItemSubcategory())->instanceToArray($item_sub_category)))->toArray(),
             201
         );
     }
@@ -335,7 +335,7 @@ public function create(
      */
     private function conditionalPostParameters($category_id): array
     {
-        $sub_categories = (new SubCategory())
+        $sub_categories = (new Subcategory())
             ->select('id', 'name', 'description')
             ->where('category_id', '=', $category_id)
             ->get();
@@ -392,7 +392,7 @@ public function delete(
             UtilityResponse::notFound(trans('entities.item-subcategory'));
         }
 
-        $item_sub_category = (new ItemSubCategory())->instance(
+        $item_sub_category = (new ItemSubcategory())->instance(
             $resource_type_id,
             $resource_id,
             $item_id,
@@ -406,13 +406,13 @@ public function delete(
 
 
         try {
-            (new ItemSubCategory())->find($item_subcategory_id)->delete();
+            (new ItemSubcategory())->find($item_subcategory_id)->delete();
 
             UtilityResponse::successNoContent();
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.item-subcategory'));
+            UtilityResponse::notFound(trans('entities.item-subcategory'), $e);
         }
     }
 }
diff --git a/app/Http/Controllers/ItemTypeController.php b/app/Http/Controllers/ItemTypeController.php
new file mode 100644
index 00000000..9e94e11b
--- /dev/null
+++ b/app/Http/Controllers/ItemTypeController.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\ItemType;
+use App\Option\Get;
+use App\Utilities\Header;
+use App\Utilities\Pagination as UtilityPagination;
+use App\Validators\Request\Route;
+use App\Models\Transformers\ItemType as ItemTypeTransformer;
+use App\Utilities\Response as UtilityResponse;
+use App\Validators\Request\SearchParameters;
+use App\Validators\Request\SortParameters;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Manage item types
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ItemTypeController extends Controller
+{
+    protected $allow_entire_collection = true;
+
+    /**
+     * Return all the item types
+     *
+     * @return JsonResponse
+     */
+    public function index(): JsonResponse
+    {
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.item-type.searchable')
+        );
+
+        $total = (new ItemType())->totalCount($search_parameters);
+
+        $sort_parameters = SortParameters::fetch(
+            Config::get('api.item-type.sortable')
+        );
+
+        $pagination = UtilityPagination::init(
+                request()->path(),
+                $total,
+                10,
+                $this->allow_entire_collection
+            )->
+            setSearchParameters($search_parameters)->
+            setSortParameters($sort_parameters)->
+            paging();
+
+        $item_types = (new ItemType())->paginatedCollection(
+            $pagination['offset'],
+            $pagination['limit'],
+            $search_parameters,
+            $sort_parameters
+        );
+
+        $headers = new Header();
+        $headers->collection($pagination, count($item_types), $total);
+
+        $sort_header = SortParameters::xHeader();
+        if ($sort_header !== null) {
+            $headers->addSort($sort_header);
+        }
+
+        $search_header = SearchParameters::xHeader();
+        if ($search_header !== null) {
+            $headers->addSearch($search_header);
+        }
+
+        return response()->json(
+            array_map(
+                function($item_type) {
+                    return (new ItemTypeTransformer($item_type))->toArray();
+                },
+                $item_types
+            ),
+            200,
+            $headers->headers()
+        );
+    }
+
+    /**
+     * Return a single item type
+     *
+     * @param string $item_type_id
+     *
+     * @return JsonResponse
+     */
+    public function show(string $item_type_id): JsonResponse
+    {
+        Route::itemType((int) $item_type_id);
+
+        $item_type = (new ItemType())->single($item_type_id);
+
+        if ($item_type === null) {
+            UtilityResponse::notFound(trans('entities.item-type'));
+        }
+
+        $headers = new Header();
+        $headers->item();
+
+        return response()->json(
+            (new ItemTypeTransformer($item_type))->toArray(),
+            200,
+            $headers->headers()
+        );
+    }
+
+    /**
+     * Generate the OPTIONS request for the item type list
+     *
+     * @return JsonResponse
+     */
+    public function optionsIndex(): JsonResponse
+    {
+        $get = Get::init()->
+            setSortable('api.item-type.sortable')->
+            setSearchable('api.item-type.searchable')->
+            setPaginationOverride(true)->
+            setDescription('route-descriptions.item_type_GET_index')->
+            setAuthenticationStatus(($this->user_id !== null) ? true : false)->
+            option();
+
+        return $this->optionsResponse(
+            $get,
+            200
+        );
+    }
+
+    /**
+     * Generate the OPTIONS request for a specific item type
+     *
+     * @param string $item_type_id
+     *
+     * @return JsonResponse
+     */
+    public function optionsShow(string $item_type_id): JsonResponse
+    {
+        Route::itemType($item_type_id);
+
+        $get = Get::init()->
+            setDescription('route-descriptions.item_type_GET_show')->
+            setAuthenticationStatus(($this->user_id !== null) ? true : false)->
+            option();
+
+        return $this->optionsResponse(
+            $get,
+            200
+        );
+    }
+}
diff --git a/app/Http/Controllers/PermittedUserController.php b/app/Http/Controllers/PermittedUserController.php
new file mode 100644
index 00000000..db744300
--- /dev/null
+++ b/app/Http/Controllers/PermittedUserController.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\PermittedUser;
+use App\Models\Transformers\PermittedUser as PermittedUserTransformer;
+use App\Option\Get;
+use App\Option\Post;
+use App\Utilities\Header;
+use App\Utilities\Pagination as UtilityPagination;
+use App\Utilities\RoutePermission;
+use App\Validators\Request\Route;
+use App\Validators\Request\SearchParameters;
+use App\Validators\Request\SortParameters;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Manage permitted users
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class PermittedUserController extends Controller
+{
+    protected $allow_entire_collection = true;
+
+    /**
+     * Return all the permitted users for the given resource type
+     *
+     * @param string $resource_type_id
+     *
+     * @return JsonResponse
+     */
+    public function index(string $resource_type_id): JsonResponse
+    {
+        Route::resourceType(
+            $resource_type_id,
+            $this->permitted_resource_types
+        );
+
+        $search_parameters = SearchParameters::fetch(
+            Config::get('api.permitted-user.searchable')
+        );
+
+        $total = (new PermittedUser())->totalCount(
+            $resource_type_id,
+            $search_parameters
+        );
+
+        $sort_parameters = SortParameters::fetch(
+            Config::get('api.permitted-user.sortable')
+        );
+
+        $pagination = UtilityPagination::init(
+                request()->path(),
+                $total,
+                10,
+                $this->allow_entire_collection
+            )->
+            setSearchParameters($search_parameters)->
+            setSortParameters($sort_parameters)->
+            paging();
+
+        $permitted_users = (new PermittedUser())->paginatedCollection(
+            $resource_type_id,
+            $pagination['offset'],
+            $pagination['limit'],
+            $search_parameters,
+            $sort_parameters
+        );
+
+        $headers = new Header();
+        $headers->collection($pagination, count($permitted_users), $total);
+
+        $sort_header = SortParameters::xHeader();
+        if ($sort_header !== null) {
+            $headers->addSort($sort_header);
+        }
+
+        $search_header = SearchParameters::xHeader();
+        if ($search_header !== null) {
+            $headers->addSearch($search_header);
+        }
+
+        return response()->json(
+            array_map(
+                function($permitted_user) {
+                    return (new PermittedUserTransformer($permitted_user))->toArray();
+                },
+                $permitted_users
+            ),
+            200,
+            $headers->headers()
+        );
+    }
+
+    /**
+     * Generate the OPTIONS request for the permitted users collection
+     *
+     * @param string $resource_type_id
+     *
+     * @return JsonResponse
+     */
+    public function optionsIndex(string $resource_type_id): JsonResponse
+    {
+        Route::resourceType(
+            $resource_type_id,
+            $this->permitted_resource_types
+        );
+
+        $permissions = RoutePermission::resourceType(
+            $resource_type_id,
+            $this->permitted_resource_types
+        );
+
+        $get = Get::init()->
+            setSortable('api.permitted-user.sortable')->
+            setSearchable('api.permitted-user.searchable')->
+            setPaginationOverride(true)->
+            setAuthenticationStatus($permissions['view'])->
+            setDescription('route-descriptions.permitted_user_GET_index')->
+            option();
+
+        $post = Post::init()->
+            setFields('api.permitted-user.fields')->
+            setDescription('route-descriptions.permitted_user_POST')->
+            setAuthenticationStatus($permissions['manage'])->
+            setAuthenticationRequired(true)->
+            option();
+
+        return $this->optionsResponse(
+            $get + $post,
+            200
+        );
+    }
+}
diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php
index 31d0ccd2..61f2572e 100644
--- a/app/Http/Controllers/RequestController.php
+++ b/app/Http/Controllers/RequestController.php
@@ -19,6 +19,7 @@
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Manage categories
@@ -80,7 +81,7 @@ public function accessLog(): JsonResponse
     {
         $total = (new RequestLog())->totalCount();
 
-        $this->collection_parameters = Parameters::fetch(['source']);
+        $this->collection_parameters = Parameters::fetch(array_keys(Config::get('api.request-access-log.parameters.collection')));
 
         $pagination = UtilityPagination::init(request()->path(), $total, 25)->paging();
 
diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
index 50a78f47..d5e2a09a 100644
--- a/app/Http/Controllers/ResourceController.php
+++ b/app/Http/Controllers/ResourceController.php
@@ -300,7 +300,7 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.resource'));
+            UtilityResponse::notFound(trans('entities.resource'), $e);
         }
     }
 
diff --git a/app/Http/Controllers/ResourceTypeController.php b/app/Http/Controllers/ResourceTypeController.php
index 775a7bb6..a1df8d9f 100644
--- a/app/Http/Controllers/ResourceTypeController.php
+++ b/app/Http/Controllers/ResourceTypeController.php
@@ -4,6 +4,7 @@
 
 use App\Models\ItemType;
 use App\Models\PermittedUser;
+use App\Models\ResourceTypeAccess;
 use App\Models\Resource;
 use App\Models\ResourceTypeItemType;
 use App\Option\Delete;
@@ -118,7 +119,7 @@ public function show(string $resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $parameters = Parameters::fetch(['include-resources']);
+        $parameters = Parameters::fetch(array_keys(Config::get('api.resource-type.parameters.item')));
 
         $resource_type = (new ResourceType())->single(
             $resource_type_id,
@@ -300,7 +301,7 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.resource-type'));
+            UtilityResponse::notFound(trans('entities.resource-type'), $e);
         }
     }
 
diff --git a/app/Http/Controllers/ResourceTypeItemController.php b/app/Http/Controllers/ResourceTypeItemController.php
index 91ac27fc..3bdadc21 100644
--- a/app/Http/Controllers/ResourceTypeItemController.php
+++ b/app/Http/Controllers/ResourceTypeItemController.php
@@ -2,21 +2,19 @@
 
 namespace App\Http\Controllers;
 
+use App\Item\ItemInterfaceFactory;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Parameters;
 use App\Validators\Request\Route;
 use App\Models\Category;
-use App\Models\ResourceTypeItem;
-use App\Models\SubCategory;
-use App\Models\Transformers\ResourceTypeItem as ResourceTypeItemTransformer;
+use App\Models\Subcategory;
 use App\Utilities\Pagination as UtilityPagination;
 use App\Validators\Request\SearchParameters;
 use App\Validators\Request\SortParameters;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Config;
 
 /**
  * View items for all resources for a resource type
@@ -27,8 +25,6 @@
  */
 class ResourceTypeItemController extends Controller
 {
-    private $conditional_get_parameters = [];
-
     /**
      * Return all the items based on the set filter options
      *
@@ -44,22 +40,21 @@ public function index(Request $request, string $resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $this->setItemInterface($resource_type_id);
-        $resource_type_item_model = $this->item_interface->resourceTypeItemModel();
+        $item_interface = ItemInterfaceFactory::resourceTypeItem($resource_type_id);
+
+        $resource_type_item_model = $item_interface->model();
 
         $collection_parameters = Parameters::fetch(
-            array_merge(
-                array_keys(Config::get('api.item.parameters.collection')),
-                array_keys($this->item_interface->collectionParameters())
-            )
+            array_keys($item_interface->collectionParameters()),
+            $resource_type_id
         );
 
         $sort_fields = SortParameters::fetch(
-            $this->item_interface->sortParameters()
+            $item_interface->sortParameters()
         );
 
         $search_conditions = SearchParameters::fetch(
-            $this->item_interface->searchParameters()
+            $item_interface->searchParameters()
         );
 
         $total = $resource_type_item_model->totalCount(
@@ -101,8 +96,8 @@ public function index(Request $request, string $resource_type_id): JsonResponse
 
         return response()->json(
             array_map(
-                function($item) {
-                    return $this->item_interface->resourceTypeItemTransformer($item)->toArray();
+                function($item) use ($item_interface) {
+                    return $item_interface->transformer($item)->toArray();
                 },
                 $items
             ),
@@ -125,24 +120,32 @@ public function optionsIndex(string $resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::resourceTypeItem($resource_type_id);
 
         $permissions = RoutePermission::resourceType(
             $resource_type_id,
             $this->permitted_resource_types
         );
 
-        $this->conditionalGetParameters(
+        $defined_parameters = Parameters::fetch(
+            array_keys($item_interface->collectionParameters()),
+            $resource_type_id
+        );
+
+        $conditional_parameters = $this->conditionalGetParameters(
             $resource_type_id,
-            ['category']
+            array_merge(
+                $item_interface->collectionParametersKeys(),
+                $defined_parameters
+            )
         );
 
         $get = Get::init()->
-            setSortable( $this->item_interface->resourceTypeItemSortParametersConfig())->
-            setSearchable($this->item_interface->resourceTypeItemSearchParametersConfig())->
+            setSortable($item_interface->sortParametersConfig())->
+            setSearchable($item_interface->searchParametersConfig())->
             setPagination(true)->
-            setParameters($this->item_interface->resourceTypeItemCollectionParametersConfig())->
-            setConditionalParameters($this->conditional_get_parameters)->
+            setParameters($item_interface->collectionParametersConfig())->
+            setConditionalParameters($conditional_parameters)->
             setDescription('route-descriptions.resource_type_item_GET_index')->
             setAuthenticationStatus($permissions['view'])->
             option();
@@ -151,80 +154,104 @@ public function optionsIndex(string $resource_type_id): JsonResponse
     }
 
     /**
-     * Fetch the conditional GET parameters reasy to be be merged with the
-     * GET parameters data array, useful for defining dynamic values such as
-     * allowed values
+     * Fetch the conditional GET parameters allowed values, ready to be be
+     * merged with the GET parameters data array, useful for defining dynamic
+     * values such as allowed values
      *
      * @param integer $resource_type_id
-     * @param array $collection_parameters
+     * @param array $parameters
+     *
+     * @return array
      */
-    private function conditionalGetParameters($resource_type_id, array $collection_parameters)
+    private function conditionalGetParameters(
+        $resource_type_id,
+        array $parameters
+    ): array
     {
-        $this->conditional_get_parameters = [
-            'year' => [
-                'allowed_values' => []
-            ],
-            'month' => [
-                'allowed_values' => []
-            ],
-            'category' => [
-                'allowed_values' => []
-            ],
-            'subcategory' => [
-                'allowed_values' => []
-            ]
-        ];
-
-        for ($i=2013; $i <= intval(date('Y')); $i++) {
-            $this->conditional_get_parameters['year']['allowed_values'][$i] = [
-                'value' => $i,
-                'name' => $i,
-                'description' => trans('resource-type-item/allowed-values.description-prefix-year') . $i
-            ];
+        $item_interface = ItemInterfaceFactory::resourceTypeItem($resource_type_id);
+
+        $conditional_parameters = [];
+
+        if (array_key_exists('year', $parameters) === true) {
+            $conditional_parameters['year']['allowed_values'] = [];
+
+            for (
+                $i = $item_interface->conditionalParameterMinYear($resource_type_id);
+                $i <= $item_interface->conditionalParameterMaxYear($resource_type_id);
+                $i++
+            ) {
+                $conditional_parameters['year']['allowed_values'][$i] = [
+                    'value' => $i,
+                    'name' => $i,
+                    'description' => trans('resource-type-item-type-' . $item_interface->type() .
+                            '/allowed-values.description-prefix-year') . $i
+                ];
+            }
         }
 
-        for ($i=1; $i < 13; $i++) {
-            $this->conditional_get_parameters['month']['allowed_values'][$i] = [
-                'value' => $i,
-                'name' => date("F", mktime(0, 0, 0, $i, 10)),
-                'description' => trans('resource-type-item/allowed-values.description-prefix-month') .
-                    date("F", mktime(0, 0, 0, $i, 1))
-            ];
+        if (array_key_exists('month', $parameters) === true) {
+            $conditional_parameters['month']['allowed_values'] = [];
+
+            for ($i=1; $i < 13; $i++) {
+                $conditional_parameters['month']['allowed_values'][$i] = [
+                    'value' => $i,
+                    'name' => date("F", mktime(0, 0, 0, $i, 10)),
+                    'description' => trans('resource-type-item-type-' . $item_interface->type() .
+                        '/allowed-values.description-prefix-month') .
+                        date("F", mktime(0, 0, 0, $i, 1))
+                ];
+            }
         }
 
-        $categories = (new Category())->paginatedCollection(
-            (int) $resource_type_id,
-            $this->permitted_resource_types,
-            $this->include_public,
-            0,
-            100
-        );
-        array_map(
-            function($category) {
-                $this->conditional_get_parameters['category']['allowed_values'][$this->hash->encode('category', $category['category_id'])] = [
+        if (array_key_exists('category', $parameters) === true) {
+            $conditional_parameters['category']['allowed_values'] = [];
+
+            $categories = (new Category())->paginatedCollection(
+                (int) $resource_type_id,
+                $this->permitted_resource_types,
+                $this->include_public,
+                0,
+                100
+            );
+
+            foreach ($categories as $category) {
+                $conditional_parameters['category']['allowed_values'][$this->hash->encode('category', $category['category_id'])] = [
                     'value' => $this->hash->encode('category', $category['category_id']),
                     'name' => $category['category_name'],
-                    'description' => trans('resource-type-item/allowed-values.description-prefix-category') .
-                        $category['category_name'] . trans('resource-type-item/allowed-values.description-suffix-category')
+                    'description' => trans('resource-type-item-type-' . $item_interface->type() .
+                            '/allowed-values.description-prefix-category') .
+                        $category['category_name'] .
+                        trans('resource-type-item-type-' . $item_interface->type() .
+                            '/allowed-values.description-suffix-category')
                 ];
-            },
-            $categories
-        );
+            }
+        }
+
+        if (
+            array_key_exists('category', $parameters) === true &&
+            $parameters['category'] !== null &&
+            array_key_exists('subcategory', $parameters) === true
+        ) {
+            $conditional_parameters['subcategory']['allowed_values'] = [];
 
-        if (array_key_exists('category', $collection_parameters) === true) {
-            $subcategories = (new SubCategory())->paginatedCollection($collection_parameters['category']);
+            $subcategories = (new Subcategory())->paginatedCollection(
+                $resource_type_id,
+                $parameters['category']
+            );
 
             array_map(
-                function($subcategory) {
-                    $this->conditional_get_parameters['subcategory']['allowed_values'][$this->hash->encode('subcategory', $subcategory['id'])] = [
-                        'value' => $this->hash->encode('subcategory', $subcategory['id']),
-                        'name' => $subcategory['name'],
-                        'description' => trans('item/allowed-values.description-prefix-subcategory') .
-                            $subcategory['name'] . trans('item/allowed-values.description-suffix-subcategory')
+                function($subcategory) use (&$conditional_parameters, $item_interface) {
+                    $conditional_parameters['subcategory']['allowed_values'][$this->hash->encode('subcategory', $subcategory['subcategory_id'])] = [
+                        'value' => $this->hash->encode('subcategory', $subcategory['subcategory_id']),
+                        'name' => $subcategory['subcategory_name'],
+                        'description' => trans('resource-type-item-type-' . $item_interface->type() . '/allowed-values.description-prefix-subcategory') .
+                            $subcategory['subcategory_name'] . trans('resource-type-item-type-' . $item_interface->type() . '/allowed-values.description-suffix-subcategory')
                     ];
                 },
                 $subcategories
             );
-          }
+        }
+
+        return $conditional_parameters;
     }
 }
diff --git a/app/Http/Controllers/SubcategoryController.php b/app/Http/Controllers/SubcategoryController.php
index 40a01c33..381ab442 100644
--- a/app/Http/Controllers/SubcategoryController.php
+++ b/app/Http/Controllers/SubcategoryController.php
@@ -11,10 +11,10 @@
 use App\Utilities\Request as UtilityRequest;
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Route;
-use App\Models\SubCategory;
-use App\Models\Transformers\SubCategory as SubCategoryTransformer;
+use App\Models\Subcategory;
+use App\Models\Transformers\Subcategory as SubcategoryTransformer;
 use App\Utilities\Response as UtilityResponse;
-use App\Validators\Request\Fields\SubCategory as SubCategoryValidator;
+use App\Validators\Request\Fields\Subcategory as SubcategoryValidator;
 use App\Validators\Request\SearchParameters;
 use App\Validators\Request\SortParameters;
 use Exception;
@@ -53,7 +53,7 @@ public function index($resource_type_id, $category_id): JsonResponse
             Config::get('api.subcategory.searchable')
         );
 
-        $total = (new SubCategory())->totalCount(
+        $total = (new Subcategory())->totalCount(
             (int) $resource_type_id,
             (int) $category_id,
             $search_parameters
@@ -73,7 +73,7 @@ public function index($resource_type_id, $category_id): JsonResponse
         setSortParameters($sort_parameters)->
         paging();
 
-        $subcategories = (new SubCategory())->paginatedCollection(
+        $subcategories = (new Subcategory())->paginatedCollection(
             (int) $resource_type_id,
             (int) $category_id,
             $pagination['offset'],
@@ -98,7 +98,7 @@ public function index($resource_type_id, $category_id): JsonResponse
         return response()->json(
             array_map(
                 function($subcategory) {
-                    return (new SubCategoryTransformer($subcategory))->toArray();
+                    return (new SubcategoryTransformer($subcategory))->toArray();
                 },
                 $subcategories
             ),
@@ -129,7 +129,7 @@ public function show(
             $this->permitted_resource_types
         );
 
-        $subcategory = (new SubCategory())->single(
+        $subcategory = (new Subcategory())->single(
             $category_id,
             $subcategory_id
         );
@@ -142,7 +142,7 @@ public function show(
         $headers->item();
 
         return response()->json(
-            (new SubCategoryTransformer($subcategory))->toArray(),
+            (new SubcategoryTransformer($subcategory))->toArray(),
             200,
             $headers->headers()
         );
@@ -263,11 +263,11 @@ public function create($resource_type_id, $category_id): JsonResponse
             true
         );
 
-        $validator = (new SubCategoryValidator)->create(['category_id' => $category_id]);
+        $validator = (new SubcategoryValidator)->create(['category_id' => $category_id]);
         UtilityRequest::validateAndReturnErrors($validator);
 
         try {
-            $sub_category = new SubCategory([
+            $sub_category = new Subcategory([
                 'category_id' => $category_id,
                 'name' => request()->input('name'),
                 'description' => request()->input('description')
@@ -278,7 +278,7 @@ public function create($resource_type_id, $category_id): JsonResponse
         }
 
         return response()->json(
-            (new SubCategoryTransformer((new SubCategory())->instanceToArray($sub_category)))->toArray(),
+            (new SubcategoryTransformer((new Subcategory())->instanceToArray($sub_category)))->toArray(),
             201
         );
     }
@@ -306,7 +306,7 @@ public function delete(
             true
         );
 
-        $sub_category = (new SubCategory())->instance(
+        $sub_category = (new Subcategory())->instance(
             $category_id,
             $subcategory_id
         );
@@ -322,7 +322,7 @@ public function delete(
         } catch (QueryException $e) {
             UtilityResponse::foreignKeyConstraintError();
         } catch (Exception $e) {
-            UtilityResponse::notFound(trans('entities.subcategory'));
+            UtilityResponse::notFound(trans('entities.subcategory'), $e);
         }
     }
 
@@ -349,7 +349,7 @@ public function update(
             true
         );
 
-        $subcategory = (new SubCategory())->instance($category_id, $subcategory_id);
+        $subcategory = (new Subcategory())->instance($category_id, $subcategory_id);
 
         if ($subcategory === null) {
             UtilityResponse::failedToSelectModelForUpdate();
@@ -357,7 +357,7 @@ public function update(
 
         UtilityRequest::checkForEmptyPatch();
 
-        $validator = (new SubCategoryValidator())->update([
+        $validator = (new SubcategoryValidator())->update([
             'category_id' => intval($category_id),
             'subcategory_id' => intval($subcategory_id)
         ]);
@@ -365,8 +365,8 @@ public function update(
 
         UtilityRequest::checkForInvalidFields(
             array_merge(
-                (new SubCategory())->patchableFields(),
-                (new SubCategoryValidator)->dynamicDefinedFields()
+                (new Subcategory())->patchableFields(),
+                (new SubcategoryValidator)->dynamicDefinedFields()
             )
         );
 
diff --git a/app/Http/Controllers/SummaryCategoryController.php b/app/Http/Controllers/Summary/CategoryController.php
similarity index 90%
rename from app/Http/Controllers/SummaryCategoryController.php
rename to app/Http/Controllers/Summary/CategoryController.php
index 9ce3df4b..a007753c 100644
--- a/app/Http/Controllers/SummaryCategoryController.php
+++ b/app/Http/Controllers/Summary/CategoryController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
-use App\Models\Category;
+use App\Http\Controllers\Controller;
+use App\Models\Summary\Category;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
@@ -16,7 +17,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryCategoryController extends Controller
+class CategoryController extends Controller
 {
     /**
      * Return a summary of the categories
@@ -32,7 +33,7 @@ public function index($resource_type_id): JsonResponse
             $this->permitted_resource_types
         );
 
-        $summary = (new Category())->totalCount(
+        $summary = (new Category())->total(
             $resource_type_id,
             $this->permitted_resource_types,
             $this->include_public
diff --git a/app/Http/Controllers/SummaryItemController.php b/app/Http/Controllers/Summary/ItemController.php
similarity index 51%
rename from app/Http/Controllers/SummaryItemController.php
rename to app/Http/Controllers/Summary/ItemController.php
index d527f29e..50f0bf4b 100644
--- a/app/Http/Controllers/SummaryItemController.php
+++ b/app/Http/Controllers/Summary/ItemController.php
@@ -1,18 +1,19 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
+use App\Http\Controllers\Controller;
+use App\Item\ItemInterfaceFactory;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\Response;
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Parameters;
 use App\Validators\Request\Route;
-use App\Models\ItemSummary;
-use App\Models\Transformers\ItemCategorySummary as ItemCategorySummaryTransformer;
-use App\Models\Transformers\ItemMonthSummary as ItemMonthSummaryTransformer;
-use App\Models\Transformers\ItemSubCategorySummary as ItemSubCategorySummaryTransformer;
-use App\Models\Transformers\ItemYearSummary as ItemYearSummaryTransformer;
+use App\Models\Transformers\Summary\ItemCategory as ItemCategoryTransformer;
+use App\Models\Transformers\Summary\ItemMonth as ItemMonthTransformer;
+use App\Models\Transformers\Summary\ItemSubcategory as ItemSubcategoryTransformer;
+use App\Models\Transformers\Summary\ItemYear as ItemYearTransformer;
 use App\Utilities\General;
 use App\Validators\Request\SearchParameters;
 use Illuminate\Http\JsonResponse;
@@ -24,14 +25,13 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryItemController extends Controller
+class ItemController extends Controller
 {
-    private $resource_type_id;
-    private $resource_id;
-    private $include_unpublished = false;
+    private $model;
 
     /**
-     * Return the TCO for the resource
+     * Return the TCO for the resource or pass the request off to the relevant
+     * method
      *
      * @param string $resource_type_id
      * @param string $resource_id
@@ -46,113 +46,198 @@ public function index(string $resource_type_id, string $resource_id): JsonRespon
             $this->permitted_resource_types
         );
 
-        $this->resource_type_id = $resource_type_id;
-        $this->resource_id = $resource_id;
-
-        $collection_parameters = Parameters::fetch([
-            'include-unpublished',
-            'year',
-            'years',
-            'month',
-            'months',
-            'category',
-            'categories',
-            'subcategory',
-            'subcategories'
-        ]);
-
-        $search_parameters = SearchParameters::fetch([
-            'description'
-        ]);
+        $item_interface = ItemInterfaceFactory::summaryItem($resource_type_id);
+        $this->model = $item_interface->model();
+
+        $parameters = Parameters::fetch(
+            $item_interface->collectionParametersKeys(),
+            (int) $resource_type_id,
+            (int) $resource_id
+        );
+
+        $years = false;
+        $months = false;
+        $categories = false;
+        $subcategories = false;
+        $year = null;
+        $month = null;
+        $category = null;
+        $subcategory = null;
 
         if (
-            array_key_exists('include-unpublished', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['include-unpublished']) === true
+            array_key_exists('years', $parameters) === true &&
+            General::booleanValue($parameters['years']) === true
         ) {
-            $this->include_unpublished = true;
+            $years = true;
+        }
+
+        if (
+            array_key_exists('months', $parameters) === true &&
+            General::booleanValue($parameters['months']) === true
+        ) {
+            $months = true;
+        }
+
+        if (array_key_exists('categories', $parameters) === true &&
+            General::booleanValue($parameters['categories']) === true) {
+            $categories = true;
+        }
+
+        if (array_key_exists('subcategories', $parameters) === true &&
+                General::booleanValue($parameters['subcategories']) === true) {
+            $subcategories = true;
         }
 
-        if (array_key_exists('years', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['years']) === true) {
-            return $this->yearsSummary();
+        if (array_key_exists('year', $parameters) === true) {
+            $year = (int) $parameters['year'];
+        }
+
+        if (array_key_exists('month', $parameters) === true) {
+            $month = (int) $parameters['month'];
+        }
+
+        if (array_key_exists('category', $parameters) === true) {
+            $category = (int) $parameters['category'];
+        }
+
+        if (array_key_exists('subcategory', $parameters) === true) {
+            $subcategory = (int) $parameters['subcategory'];
+        }
+
+        unset(
+            $parameters['years'],
+            $parameters['year'],
+            $parameters['months'],
+            $parameters['month'],
+            $parameters['categories'],
+            $parameters['category'],
+            $parameters['subcategories'],
+            $parameters['subcategory']
+        );
+
+        $search_parameters = SearchParameters::fetch(
+            $item_interface->searchParameters()
+        );
+
+        if ($years === true) {
+            return $this->yearsSummary(
+                (int) $resource_type_id,
+                (int) $resource_id,
+                $parameters
+            );
         } else if (
-            array_key_exists('year', $collection_parameters) === true &&
-            array_key_exists('category', $collection_parameters) === false &&
-            array_key_exists('subcategory', $collection_parameters) === false &&
+            $year !== null &&
+            $category === null &&
+            $subcategory === null &&
             count($search_parameters) === 0
         ) {
-            if (array_key_exists('months', $collection_parameters) === true &&
-                General::booleanValue($collection_parameters['months']) === true) {
-                return $this->monthsSummary($collection_parameters['year']);
-            } else if (array_key_exists('month', $collection_parameters) === true) {
+            if ($months === true) {
+                return $this->monthsSummary(
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $year,
+                    $parameters
+                );
+            } else if ($month !== null) {
                 return $this->monthSummary(
-                    $collection_parameters['year'],
-                    $collection_parameters['month']
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $year,
+                    $month,
+                    $parameters
                 );
             } else {
-                return $this->yearSummary($collection_parameters['year']);
+                return $this->yearSummary(
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $year,
+                    $parameters
+                );
             }
         }
 
-        if (array_key_exists('categories', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['categories']) === true) {
-            return $this->categoriesSummary();
+        if ($categories === true) {
+            return $this->categoriesSummary(
+                (int) $resource_type_id,
+                (int) $resource_id,
+                $parameters
+            );
         } else if (
-            array_key_exists('category', $collection_parameters) === true &&
-            array_key_exists('year', $collection_parameters) === false &&
-            array_key_exists('month', $collection_parameters) === false &&
+            $category !== null &&
+            $year === null &&
+            $month === null &&
             count($search_parameters) === 0
         ) {
-            if (array_key_exists('subcategories', $collection_parameters) === true &&
-                General::booleanValue($collection_parameters['subcategories']) === true) {
+            if ($subcategories === true) {
                 return $this->subcategoriesSummary(
-                    $resource_type_id,
-                    $collection_parameters['category']
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $category,
+                    $parameters
                 );
-            } else if (array_key_exists('subcategory', $collection_parameters) === true) {
+            } else if ($subcategory !== null) {
                 return $this->subcategorySummary(
-                    $resource_type_id,
-                    $collection_parameters['category'],
-                    $collection_parameters['subcategory']
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $category,
+                    $subcategory,
+                    $parameters
                 );
             } else {
                 return $this->categorySummary(
-                    $resource_type_id,
-                    $collection_parameters['category']
+                    (int) $resource_type_id,
+                    (int) $resource_id,
+                    $category,
+                    $parameters
                 );
             }
         }
 
         if (
-            array_key_exists('category', $collection_parameters) === true ||
-            array_key_exists('subcategory', $collection_parameters) === true ||
-            array_key_exists('year', $collection_parameters) === true ||
-            array_key_exists('month', $collection_parameters) === true ||
+            $category !== null ||
+            $subcategory !== null ||
+            $year !== null ||
+            $month !== null ||
             count($search_parameters) > 0
         ) {
             return $this->filteredSummary(
-                (array_key_exists('category', $collection_parameters) ? $collection_parameters['category'] : null),
-                (array_key_exists('subcategory', $collection_parameters) ? $collection_parameters['subcategory'] : null),
-                (array_key_exists('year', $collection_parameters) ? $collection_parameters['year'] : null),
-                (array_key_exists('month', $collection_parameters) ? $collection_parameters['month'] : null),
+                (int) $resource_type_id,
+                (int) $resource_id,
+                $category,
+                $subcategory,
+                $year,
+                $month,
+                $parameters,
                 (count($search_parameters) > 0 ? $search_parameters : [])
             );
         }
 
-        return $this->tcoSummary();
+        return $this->tcoSummary(
+            (int) $resource_type_id,
+            (int) $resource_id,
+            $parameters
+        );
     }
 
     /**
      * Return the total summary for a resource, total cost of ownership
      *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function tcoSummary(): JsonResponse
+    private function tcoSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->summary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $this->include_unpublished
+        $summary = $this->model->summary(
+            $resource_type_id,
+            $resource_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -170,7 +255,7 @@ private function tcoSummary(): JsonResponse
 
         return response()->json(
             [
-                'total' => number_format($summary[0]['actualised_total'], 2, '.', '')
+                'total' => number_format($summary[0]['total'], 2, '.', '')
             ],
             200,
             $headers->headers()
@@ -180,14 +265,22 @@ private function tcoSummary(): JsonResponse
     /**
      * Return the annualised summary for a resource
      *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function yearsSummary(): JsonResponse
+    private function yearsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->yearsSummary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $this->include_unpublished
+        $summary = $this->model->yearsSummary(
+            $resource_type_id,
+            $resource_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -206,7 +299,7 @@ private function yearsSummary(): JsonResponse
         return response()->json(
             array_map(
                 function($year) {
-                    return (new ItemYearSummaryTransformer($year))->toArray();
+                    return (new ItemYearTransformer($year))->toArray();
                 },
                 $summary
             ),
@@ -218,17 +311,25 @@ function($year) {
     /**
      * Return the total cost for a specific year
      *
-     * @param integer $year
+     * @param int $resource_type_id,
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function yearSummary(int $year): JsonResponse
+    private function yearSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->yearSummary(
-            $this->resource_type_id,
-            $this->resource_id,
+        $summary = $this->model->yearSummary(
+            $resource_type_id,
+            $resource_id,
             $year,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -245,7 +346,7 @@ private function yearSummary(int $year): JsonResponse
         }
 
         return response()->json(
-            (new ItemYearSummaryTransformer($summary[0]))->toArray(),
+            (new ItemYearTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -254,17 +355,25 @@ private function yearSummary(int $year): JsonResponse
     /**
      * Return the monthly summary for a specific year
      *
-     * @param integer $year
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function monthsSummary(int $year): JsonResponse
+    private function monthsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->monthsSummary(
-            $this->resource_type_id,
-            $this->resource_id,
+        $summary = $this->model->monthsSummary(
+            $resource_type_id,
+            $resource_id,
             $year,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -283,7 +392,7 @@ private function monthsSummary(int $year): JsonResponse
         return response()->json(
             array_map(
                 function($month) {
-                    return (new ItemMonthSummaryTransformer($month))->toArray();
+                    return (new ItemMonthTransformer($month))->toArray();
                 },
                 $summary
             ),
@@ -295,19 +404,28 @@ function($month) {
     /**
      * Return the month summary for a specific year and month
      *
-     * @param integer $year
-     * @param integer $month
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param int $month
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function monthSummary(int $year, int $month): JsonResponse
+    private function monthSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        int $month,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->monthSummary(
-            $this->resource_type_id,
-            $this->resource_id,
+        $summary = $this->model->monthSummary(
+            $resource_type_id,
+            $resource_id,
             $year,
             $month,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -324,7 +442,7 @@ private function monthSummary(int $year, int $month): JsonResponse
         }
 
         return response()->json(
-            (new ItemMonthSummaryTransformer($summary[0]))->toArray(),
+            (new ItemMonthTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -333,14 +451,22 @@ private function monthSummary(int $year, int $month): JsonResponse
     /**
      * Return the categories summary for a resource
      *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function categoriesSummary(): JsonResponse
+    private function categoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ItemSummary())->categoriesSummary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $this->include_unpublished
+        $summary = $this->model->categoriesSummary(
+            $resource_type_id,
+            $resource_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -359,7 +485,7 @@ private function categoriesSummary(): JsonResponse
         return response()->json(
             array_map(
                 function($category) {
-                    return (new ItemCategorySummaryTransformer($category))->toArray();
+                    return (new ItemCategoryTransformer($category))->toArray();
                 },
                 $summary
             ),
@@ -371,31 +497,37 @@ function($category) {
     /**
      * Return a filtered summary
      *
+     * @param int $resource_type_id
+     * @param int $resource_id
      * @param int|null $category_id
      * @param int|null $subcategory_id
      * @param int|null $year
      * @param int|null $month
+     * @param array $parameters
      * @param array $search_parameters
      *
      * @return JsonResponse
      */
     private function filteredSummary(
+        int $resource_type_id,
+        int $resource_id,
         int $category_id = null,
         int $subcategory_id = null,
         int $year = null,
         int $month = null,
+        array $parameters = [],
         array $search_parameters = []
     ): JsonResponse
     {
-        $summary = (new ItemSummary())->filteredSummary(
-            $this->resource_type_id,
-            $this->resource_id,
+        $summary = $this->model->filteredSummary(
+            $resource_type_id,
+            $resource_id,
             $category_id,
             $subcategory_id,
             $year,
             $month,
+            $parameters,
             $search_parameters,
-            $this->include_unpublished
         );
 
         if (count($summary) === 0) {
@@ -423,24 +555,25 @@ private function filteredSummary(
     /**
      * Return the category summary for a resource
      *
-     * @param integer $resource_type_id
-     * @param integer $category_id
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function categorySummary(int $resource_type_id, int $category_id): JsonResponse
+    private function categorySummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters
+    ): JsonResponse
     {
-        Route::category(
+         $summary = $this->model->categorySummary(
             $resource_type_id,
+            $resource_id,
             $category_id,
-            $this->permitted_resource_types
-        );
-
-        $summary = (new ItemSummary())->categorySummary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $category_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -457,7 +590,7 @@ private function categorySummary(int $resource_type_id, int $category_id): JsonR
         }
 
         return response()->json(
-            (new ItemCategorySummaryTransformer($summary[0]))->toArray(),
+            (new ItemCategoryTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -466,24 +599,25 @@ private function categorySummary(int $resource_type_id, int $category_id): JsonR
     /**
      * Return the subcategories summary for a category
      *
-     * @param integer $resource_type_id
-     * @param integer $category_id
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function subcategoriesSummary(int $resource_type_id, int $category_id): JsonResponse
+    private function subcategoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters
+    ): JsonResponse
     {
-        Route::category(
+        $summary = $this->model->subCategoriesSummary(
             $resource_type_id,
+            $resource_id,
             $category_id,
-            $this->permitted_resource_types
-        );
-
-        $summary = (new ItemSummary())->subCategoriesSummary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $category_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -502,7 +636,7 @@ private function subcategoriesSummary(int $resource_type_id, int $category_id):
         return response()->json(
             array_map(
                 function($subcategory) {
-                    return (new ItemSubCategorySummaryTransformer($subcategory))->toArray();
+                    return (new ItemSubcategoryTransformer($subcategory))->toArray();
                 },
                 $summary
             ),
@@ -514,31 +648,28 @@ function($subcategory) {
     /**
      * Return the subcategories summary for a category
      *
-     * @param integer $resource_type_id
-     * @param integer $category_id
-     * @param integer $subcategory_id
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
     private function subcategorySummary(
         int $resource_type_id,
+        int $resource_id,
         int $category_id,
-        int $subcategory_id
+        int $subcategory_id,
+        array $parameters
     ): JsonResponse
     {
-        Route::subcategory(
+        $summary = $this->model->subCategorySummary(
             $resource_type_id,
+            $resource_id,
             $category_id,
             $subcategory_id,
-            $this->permitted_resource_types
-        );
-
-        $summary = (new ItemSummary())->subCategorySummary(
-            $this->resource_type_id,
-            $this->resource_id,
-            $category_id,
-            $subcategory_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -555,7 +686,7 @@ private function subcategorySummary(
         }
 
         return response()->json(
-            (new ItemSubCategorySummaryTransformer($summary[0]))->toArray(),
+            (new ItemSubcategoryTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -577,7 +708,7 @@ public function optionsIndex(string $resource_type_id, string $resource_id)
             $this->permitted_resource_types
         );
 
-        $this->setItemInterface($resource_type_id);
+        $item_interface = ItemInterfaceFactory::summaryItem($resource_type_id);
 
         $permissions = RoutePermission::resource(
             $resource_type_id,
@@ -586,8 +717,8 @@ public function optionsIndex(string $resource_type_id, string $resource_id)
         );
 
         $get = Get::init()->
-            setParameters('api.item.summary-parameters.collection')->
-            setSearchable($this->item_interface->searchParametersConfig())->
+            setParameters($item_interface->collectionParametersConfig())->
+            setSearchable($item_interface->searchParametersConfig())->
             setDescription('route-descriptions.summary_GET_resource-type_resource_items')->
             setAuthenticationStatus($permissions['view'])->
             option();
diff --git a/app/Http/Controllers/SummaryRequestController.php b/app/Http/Controllers/Summary/RequestController.php
similarity index 80%
rename from app/Http/Controllers/SummaryRequestController.php
rename to app/Http/Controllers/Summary/RequestController.php
index ecbceed1..fc4f6ffc 100644
--- a/app/Http/Controllers/SummaryRequestController.php
+++ b/app/Http/Controllers/Summary/RequestController.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
+use App\Http\Controllers\Controller;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Validators\Request\Parameters;
-use App\Models\RequestLog;
+use App\Models\Summary\RequestLog;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 
 /**
  * Manage categories
@@ -16,20 +17,18 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryRequestController extends Controller
+class RequestController extends Controller
 {
     private $collection_parameters;
 
     /**
      * Return a summary of the access log, requests per year and month
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      */
-    public function accessLog(Request $request): JsonResponse
+    public function accessLog(): JsonResponse
     {
-        $this->collection_parameters = Parameters::fetch(['source']);
+        $this->collection_parameters = Parameters::fetch(array_keys(Config::get('api.request-access-log.summary-parameters.collection')));
 
         $request_data = (new RequestLog())->monthlyRequests($this->collection_parameters);
 
@@ -57,11 +56,9 @@ public function accessLog(Request $request): JsonResponse
     /**
      * Generate the OPTIONS request for summary of the access log
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      */
-    public function optionsAccessLog(Request $request)
+    public function optionsAccessLog()
     {
         $get = Get::init()->
             setParameters('api.request-access-log.parameters.collection')->
diff --git a/app/Http/Controllers/SummaryResourceController.php b/app/Http/Controllers/Summary/ResourceController.php
similarity index 83%
rename from app/Http/Controllers/SummaryResourceController.php
rename to app/Http/Controllers/Summary/ResourceController.php
index f94e8a96..ac23983b 100644
--- a/app/Http/Controllers/SummaryResourceController.php
+++ b/app/Http/Controllers/Summary/ResourceController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
+use App\Http\Controllers\Controller;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Route;
-use App\Models\Resource;
+use App\Models\Summary\Resource;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 /**
  * Summary controller for the resource routes
@@ -17,17 +17,16 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryResourceController extends Controller
+class ResourceController extends Controller
 {
     /**
      * Return a summary of the resources
      *
-     * @param Request $request
      * @param string $resource_type_id
      *
      * @return JsonResponse
      */
-    public function index(Request $request, string $resource_type_id): JsonResponse
+    public function index(string $resource_type_id): JsonResponse
     {
         Route::resourceType(
             $resource_type_id,
@@ -57,12 +56,11 @@ public function index(Request $request, string $resource_type_id): JsonResponse
     /**
      * Generate the OPTIONS request for the resource summary
      *
-     * @param Request $request
      * @param string $resource_type_id
      *
      * @return JsonResponse
      */
-    public function optionsIndex(Request $request, string $resource_type_id): JsonResponse
+    public function optionsIndex(string $resource_type_id): JsonResponse
     {
         Route::resourceType(
             $resource_type_id,
diff --git a/app/Http/Controllers/SummaryResourceTypeController.php b/app/Http/Controllers/Summary/ResourceTypeController.php
similarity index 89%
rename from app/Http/Controllers/SummaryResourceTypeController.php
rename to app/Http/Controllers/Summary/ResourceTypeController.php
index 21967d4d..de83603b 100644
--- a/app/Http/Controllers/SummaryResourceTypeController.php
+++ b/app/Http/Controllers/Summary/ResourceTypeController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
-use App\Models\ResourceType;
+use App\Http\Controllers\Controller;
+use App\Models\Summary\ResourceType;
 use App\Option\Get;
 use App\Utilities\Header;
 use Illuminate\Http\JsonResponse;
@@ -14,7 +15,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryResourceTypeController extends Controller
+class ResourceTypeController extends Controller
 {
     /**
      * Return a summary of the resource types
diff --git a/app/Http/Controllers/SummaryResourceTypeItemController.php b/app/Http/Controllers/Summary/ResourceTypeItemController.php
similarity index 53%
rename from app/Http/Controllers/SummaryResourceTypeItemController.php
rename to app/Http/Controllers/Summary/ResourceTypeItemController.php
index 74208d58..21280099 100644
--- a/app/Http/Controllers/SummaryResourceTypeItemController.php
+++ b/app/Http/Controllers/Summary/ResourceTypeItemController.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
+use App\Http\Controllers\Controller;
+use App\Item\ItemInterfaceFactory;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
 use App\Validators\Request\Parameters;
 use App\Validators\Request\Route;
-use App\Models\ResourceTypeItem;
-use App\Models\Transformers\ResourceTypeItemCategorySummary as ResourceTypeItemCategorySummaryTransformer;
-use App\Models\Transformers\ResourceTypeItemMonthSummary as ResourceTypeItemMonthSummaryTransformer;
-use App\Models\Transformers\ResourceTypeItemResourceSummary as ResourceTypeItemResourceSummaryTransformer;
-use App\Models\Transformers\ResourceTypeItemSubcategorySummary as ResourceTypeItemSubcategorySummaryTransformer;
-use App\Models\Transformers\ResourceTypeItemYearSummary as ResourceTypeItemYearSummaryTransformer;
+use App\Models\Transformers\Summary\ResourceTypeItemCategory as ResourceTypeItemCategoryTransformer;
+use App\Models\Transformers\Summary\ResourceTypeItemMonth as ResourceTypeItemMonthTransformer;
+use App\Models\Transformers\Summary\ResourceTypeItemResource as ResourceTypeItemResourceTransformer;
+use App\Models\Transformers\Summary\ResourceTypeItemSubcategory as ResourceTypeItemSubcategoryTransformer;
+use App\Models\Transformers\Summary\ResourceTypeItemYear as ResourceTypeItemYearTransformer;
 use App\Utilities\General;
 use App\Utilities\Response as UtilityResponse;
 use App\Validators\Request\SearchParameters;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 /**
  * Summary for resource type items route
@@ -26,138 +26,222 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummaryResourceTypeItemController extends Controller
+class ResourceTypeItemController extends Controller
 {
-    private $resource_type_id;
-    private $include_unpublished = false;
+    private $model;
 
     /**
      * Return the TCO for all the resources within the resource type
      *
-     * @param Request $request
      * @param string $resource_type_id
      *
      * @return JsonResponse
      */
-    public function index(Request $request, string $resource_type_id): JsonResponse
+    public function index(string $resource_type_id): JsonResponse
     {
         Route::resourceType(
             $resource_type_id,
             $this->permitted_resource_types
         );
 
-        $this->resource_type_id = $resource_type_id;
-
-        $collection_parameters = Parameters::fetch([
-            'include-unpublished',
-            'resources',
-            'year',
-            'years',
-            'month',
-            'months',
-            'category',
-            'categories',
-            'subcategory',
-            'subcategories'
-        ]);
-
-        $search_parameters = SearchParameters::fetch([
-            'description'
-        ]);
+        $item_interface = ItemInterfaceFactory::summaryResourceTypeItem($resource_type_id);
+        $this->model = $item_interface->model();
+
+        $parameters = Parameters::fetch(
+            $item_interface->collectionParametersKeys(),
+            $resource_type_id
+        );
+
+        $resources = false;
+        $years = false;
+        $months = false;
+        $categories = false;
+        $subcategories = false;
+        $year = null;
+        $month = null;
+        $category = null;
+        $subcategory = null;
+
+        if (
+            array_key_exists('resources', $parameters) === true &&
+            General::booleanValue($parameters['resources']) === true
+        ) {
+            $resources = true;
+        }
+
+        if (
+            array_key_exists('years', $parameters) === true &&
+            General::booleanValue($parameters['years']) === true
+        ) {
+            $years = true;
+        }
 
         if (
-            array_key_exists('include-unpublished', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['include-unpublished']) === true
+            array_key_exists('months', $parameters) === true &&
+            General::booleanValue($parameters['months']) === true
         ) {
-            $this->include_unpublished = true;
+            $months = true;
+        }
+
+        if (array_key_exists('categories', $parameters) === true &&
+            General::booleanValue($parameters['categories']) === true) {
+            $categories = true;
+        }
+
+        if (array_key_exists('subcategories', $parameters) === true &&
+                General::booleanValue($parameters['subcategories']) === true) {
+            $subcategories = true;
         }
 
-        if (array_key_exists('years', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['years']) === true) {
-            return $this->yearsSummary();
+        if (array_key_exists('year', $parameters) === true) {
+            $year = (int) $parameters['year'];
+        }
+
+        if (array_key_exists('month', $parameters) === true) {
+            $month = (int) $parameters['month'];
+        }
+
+        if (array_key_exists('category', $parameters) === true) {
+            $category = (int) $parameters['category'];
+        }
+
+        if (array_key_exists('subcategory', $parameters) === true) {
+            $subcategory = (int) $parameters['subcategory'];
+        }
+
+        unset(
+            $parameters['resources'],
+            $parameters['years'],
+            $parameters['year'],
+            $parameters['months'],
+            $parameters['month'],
+            $parameters['categories'],
+            $parameters['category'],
+            $parameters['subcategories'],
+            $parameters['subcategory']
+        );
+
+        $search_parameters = SearchParameters::fetch(
+            $item_interface->searchParameters()
+        );
+
+        if ($years === true) {
+            return $this->yearsSummary(
+                $resource_type_id,
+                $parameters
+            );
         } else if (
-            array_key_exists('year', $collection_parameters) === true &&
-            array_key_exists('category', $collection_parameters) === false &&
-            array_key_exists('subcategory', $collection_parameters) === false &&
+            $year !== null &&
+            $category === null &&
+            $subcategory === null &&
             count($search_parameters) === 0
         ) {
-            if (
-                array_key_exists('months', $collection_parameters) === true &&
-                General::booleanValue($collection_parameters['months']) === true
-            ) {
-                return $this->monthsSummary($collection_parameters['year']);
+            if ($months === true) {
+                return $this->monthsSummary(
+                    $resource_type_id,
+                    $year,
+                    $parameters
+                );
             } else {
-                if (array_key_exists('month', $collection_parameters) === true) {
+                if ($month !== null) {
                     return $this->monthSummary(
-                        $collection_parameters['year'],
-                        $collection_parameters['month']
+                        $resource_type_id,
+                        $year,
+                        $month,
+                        $parameters
                     );
                 } else {
-                    return $this->yearSummary($collection_parameters['year']);
+                    return $this->yearSummary(
+                        $resource_type_id,
+                        $year,
+                        $parameters
+                    );
                 }
             }
         }
 
-        if (array_key_exists('categories', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['categories']) === true) {
-            return $this->categoriesSummary();
+        if ($categories === true) {
+            return $this->categoriesSummary(
+                $resource_type_id,
+                $parameters
+            );
         } else if (
-            array_key_exists('category', $collection_parameters) === true &&
-            array_key_exists('year', $collection_parameters) === false &&
-            array_key_exists('month', $collection_parameters) === false &&
+            $category !== null &&
+            $year === null &&
+            $month === null &&
             count($search_parameters) === 0
         ) {
-            if (
-                array_key_exists('subcategories', $collection_parameters) === true &&
-                General::booleanValue($collection_parameters['subcategories']) === true
-            ) {
-                return $this->subcategoriesSummary($collection_parameters['category']);
+            if ($subcategories === true) {
+                return $this->subcategoriesSummary(
+                    $resource_type_id,
+                    $category,
+                    $parameters
+                );
             } else {
-                if (array_key_exists('subcategory', $collection_parameters) === true) {
+                if ($subcategory !== null) {
                     return $this->subcategorySummary(
-                        $collection_parameters['category'],
-                        $collection_parameters['subcategory']
+                        $resource_type_id,
+                        $category,
+                        $subcategory,
+                        $parameters
                     );
                 } else {
-                    return $this->categorySummary($collection_parameters['category']);
+                    return $this->categorySummary(
+                        $resource_type_id,
+                        $category,
+                        $parameters
+                    );
                 }
             }
         }
 
-        if (array_key_exists('resources', $collection_parameters) === true &&
-            General::booleanValue($collection_parameters['resources']) === true) {
-            return $this->resourcesSummary();
+        if ($resources === true) {
+            return $this->resourcesSummary(
+                $resource_type_id,
+                $parameters
+            );
         }
 
         if (
-            array_key_exists('category', $collection_parameters) === true ||
-            array_key_exists('subcategory', $collection_parameters) === true ||
-            array_key_exists('year', $collection_parameters) === true ||
-            array_key_exists('month', $collection_parameters) === true ||
+            $category === true ||
+            $subcategory === true ||
+            $year === true ||
+            $month === true ||
             count($search_parameters) > 0
         ) {
             return $this->filteredSummary(
-                (array_key_exists('category', $collection_parameters) ? $collection_parameters['category'] : null),
-                (array_key_exists('subcategory', $collection_parameters) ? $collection_parameters['subcategory'] : null),
-                (array_key_exists('year', $collection_parameters) ? $collection_parameters['year'] : null),
-                (array_key_exists('month', $collection_parameters) ? $collection_parameters['month'] : null),
+                $resource_type_id,
+                $category,
+                $subcategory,
+                $year,
+                $month,
+                $parameters,
                 (count($search_parameters) > 0 ? $search_parameters : [])
             );
         }
 
-        return $this->summary();
+        return $this->summary(
+            $resource_type_id,
+            $parameters
+        );
     }
 
     /**
      * Return the total summary for all the resources in the resource type
      *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function summary(): JsonResponse
+    private function summary(
+        int $resource_type_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new \App\Models\ResourceTypeItemTypeAllocatedExpense())->summary(
-            $this->resource_type_id,
-            $this->include_unpublished
+        $summary = $this->model->summary(
+            $resource_type_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -191,13 +275,19 @@ private function summary(): JsonResponse
      * Return the total summary for all the resources in the resource type
      * grouped by resource
      *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function resourcesSummary(): JsonResponse
+    private function resourcesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->resourcesSummary(
-            $this->resource_type_id,
-            $this->include_unpublished
+        $summary = $this->model->resourcesSummary(
+            $resource_type_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -216,7 +306,7 @@ private function resourcesSummary(): JsonResponse
         return response()->json(
             array_map(
                 function ($resource) {
-                    return (new ResourceTypeItemResourceSummaryTransformer($resource))->toArray();
+                    return (new ResourceTypeItemResourceTransformer($resource))->toArray();
                 },
                 $summary
             ),
@@ -229,13 +319,19 @@ function ($resource) {
      * Return the total summary for all the resources in the resource type
      * grouped by year
      *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function yearsSummary(): JsonResponse
+    private function yearsSummary(
+        int $resource_type_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->yearsSummary(
-            $this->resource_type_id,
-            $this->include_unpublished
+        $summary = $this->model->yearsSummary(
+            $resource_type_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -254,7 +350,7 @@ private function yearsSummary(): JsonResponse
         return response()->json(
             array_map(
                 function ($year) {
-                    return (new ResourceTypeItemYearSummaryTransformer($year))->toArray();
+                    return (new ResourceTypeItemYearTransformer($year))->toArray();
                 },
                 $summary
             ),
@@ -267,15 +363,22 @@ function ($year) {
      * Return the total summary for all the resources in the resource type
      * for the requested year
      *
-     * @param integer $year
+     * @param int $resource_type_id
+     * @param int $year
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function yearSummary($year): JsonResponse
+    private function yearSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->yearSummary(
-            $this->resource_type_id,
+        $summary = $this->model->yearSummary(
+            $resource_type_id,
             $year,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -292,7 +395,7 @@ private function yearSummary($year): JsonResponse
         }
 
         return response()->json(
-            (new ResourceTypeItemYearSummaryTransformer($summary[0]))->toArray(),
+            (new ResourceTypeItemYearTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -302,16 +405,22 @@ private function yearSummary($year): JsonResponse
      * Return the total summary for all the resources in the resource type
      * grouped by year
      *
-     * @param integer $year
+     * @param int $resource_type_id
+     * @param int $year
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function monthsSummary(int $year): JsonResponse
+    private function monthsSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->monthsSummary(
-            $this->resource_type_id,
+        $summary = $this->model->monthsSummary(
+            $resource_type_id,
             $year,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -330,7 +439,7 @@ private function monthsSummary(int $year): JsonResponse
         return response()->json(
             array_map(
                 function ($month) {
-                    return (new ResourceTypeItemMonthSummaryTransformer($month))->toArray();
+                    return (new ResourceTypeItemMonthTransformer($month))->toArray();
                 },
                 $summary
             ),
@@ -343,18 +452,25 @@ function ($month) {
      * Return the total summary for all the resources in the resource type
      * for a specific month
      *
-     * @param integer $year
-     * @param integer $month
+     * @param int $resource_type_id
+     * @param int $year
+     * @param int $month
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function monthSummary(int $year, int $month): JsonResponse
+    private function monthSummary(
+        int $resource_type_id,
+        int $year,
+        int $month,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->monthSummary(
-            $this->resource_type_id,
+        $summary = $this->model->monthSummary(
+            $resource_type_id,
             $year,
             $month,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -371,7 +487,7 @@ private function monthSummary(int $year, int $month): JsonResponse
         }
 
         return response()->json(
-            (new ResourceTypeItemMonthSummaryTransformer($summary[0]))->toArray(),
+            (new ResourceTypeItemMonthTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -381,13 +497,19 @@ private function monthSummary(int $year, int $month): JsonResponse
      * Return the total summary for all the resources in the resource type
      * grouped by category
      *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
      * @return JsonResponse
      */
-    private function categoriesSummary(): JsonResponse
+    private function categoriesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->categoriesSummary(
-            $this->resource_type_id,
-            $this->include_unpublished
+        $summary = $this->model->categoriesSummary(
+            $resource_type_id,
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -406,7 +528,7 @@ private function categoriesSummary(): JsonResponse
         return response()->json(
             array_map(
                 function ($category) {
-                    return (new ResourceTypeItemCategorySummaryTransformer($category))->toArray();
+                    return (new ResourceTypeItemCategoryTransformer($category))->toArray();
                 },
                 $summary
             ),
@@ -419,16 +541,22 @@ function ($category) {
      * Return the total summary for all the resources in the resource type
      * for a specific category
      *
-     * @param integer $category_id
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function categorySummary(int $category_id): JsonResponse
+    private function categorySummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->categorySummary(
-            $this->resource_type_id,
+        $summary = $this->model->categorySummary(
+            $resource_type_id,
             $category_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -445,7 +573,7 @@ private function categorySummary(int $category_id): JsonResponse
         }
 
         return response()->json(
-            (new ResourceTypeItemCategorySummaryTransformer($summary[0]))->toArray(),
+            (new ResourceTypeItemCategoryTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -454,30 +582,34 @@ private function categorySummary(int $category_id): JsonResponse
     /**
      * Return a filtered summary
      *
+     * @param int $resource_type_id
      * @param int|null $category_id
      * @param int|null $subcategory_id
      * @param int|null $year
      * @param int|null $month
+     * @param array $parameters
      * @param array $search_parameters
      *
      * @return JsonResponse
      */
-    public function filteredSummary(
+    private function filteredSummary(
+        int $resource_type_id,
         int $category_id = null,
         int $subcategory_id = null,
         int $year = null,
         int $month = null,
+        array $parameters = [],
         array $search_parameters = []
     ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->filteredSummary(
-            $this->resource_type_id,
+        $summary = $this->model->filteredSummary(
+            $resource_type_id,
             $category_id,
             $subcategory_id,
             $year,
             $month,
             $search_parameters,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -506,16 +638,22 @@ public function filteredSummary(
      * Return the total summary for all the resources in the resource type
      * and category grouped by subcategory
      *
-     * @param integer $category_id
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function subcategoriesSummary(int $category_id): JsonResponse
+    private function subcategoriesSummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->subcategoriesSummary(
-            $this->resource_type_id,
+        $summary = $this->model->subcategoriesSummary(
+            $resource_type_id,
             $category_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -534,7 +672,7 @@ private function subcategoriesSummary(int $category_id): JsonResponse
         return response()->json(
             array_map(
                 function ($category) {
-                    return (new ResourceTypeItemSubcategorySummaryTransformer($category))->toArray();
+                    return (new ResourceTypeItemSubcategoryTransformer($category))->toArray();
                 },
                 $summary
             ),
@@ -547,18 +685,25 @@ function ($category) {
      * Return the total summary for all the resources in the resource type
      * for a specific category and subcategory
      *
-     * @param integer $category_id
-     * @param integer $subcategory_id
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
      *
      * @return JsonResponse
      */
-    private function subcategorySummary(int $category_id, int $subcategory_id): JsonResponse
+    private function subcategorySummary(
+        int $resource_type_id,
+        int $category_id,
+        int $subcategory_id,
+        array $parameters
+    ): JsonResponse
     {
-        $summary = (new ResourceTypeItem())->subcategorySummary(
-            $this->resource_type_id,
+        $summary = $this->model->subcategorySummary(
+            $resource_type_id,
             $category_id,
             $subcategory_id,
-            $this->include_unpublished
+            $parameters
         );
 
         if (count($summary) === 0) {
@@ -575,7 +720,7 @@ private function subcategorySummary(int $category_id, int $subcategory_id): Json
         }
 
         return response()->json(
-            (new ResourceTypeItemSubcategorySummaryTransformer($summary[0]))->toArray(),
+            (new ResourceTypeItemSubcategoryTransformer($summary[0]))->toArray(),
             200,
             $headers->headers()
         );
@@ -593,18 +738,20 @@ private function subcategorySummary(int $category_id, int $subcategory_id): Json
     public function optionsIndex(string $resource_type_id): JsonResponse
     {
         Route::resourceType(
-            $resource_type_id,
+            (int) $resource_type_id,
             $this->permitted_resource_types
         );
 
+        $item_interface = ItemInterfaceFactory::summaryResourceTypeItem($resource_type_id);
+
         $permissions = RoutePermission::resourceType(
             $resource_type_id,
             $this->permitted_resource_types
         );
 
         $get = Get::init()->
-            setSearchable('api.resource-type-item.searchable')->
-            setParameters('api.resource-type-item.summary-parameters.collection')->
+            setSearchable($item_interface->searchParametersConfig())->
+            setParameters($item_interface->collectionParametersConfig())->
             setDescription('route-descriptions.summary-resource-type-item-GET-index')->
             setAuthenticationStatus($permissions['view'])->
             option();
diff --git a/app/Http/Controllers/SummarySubcategoryController.php b/app/Http/Controllers/Summary/SubcategoryController.php
similarity index 92%
rename from app/Http/Controllers/SummarySubcategoryController.php
rename to app/Http/Controllers/Summary/SubcategoryController.php
index 5e63e42d..a8fd3358 100644
--- a/app/Http/Controllers/SummarySubcategoryController.php
+++ b/app/Http/Controllers/Summary/SubcategoryController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Summary;
 
-use App\Models\SubCategory;
+use App\Http\Controllers\Controller;
+use App\Models\Summary\SubCategory;
 use App\Option\Get;
 use App\Utilities\Header;
 use App\Utilities\RoutePermission;
@@ -16,7 +17,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SummarySubcategoryController extends Controller
+class SubcategoryController extends Controller
 {
     /**
      * Return a summary of the subcategories
diff --git a/app/Http/Middleware/ConvertGetParameters.php b/app/Http/Middleware/ConvertGetParameters.php
index d5c4d72c..4e61e629 100644
--- a/app/Http/Middleware/ConvertGetParameters.php
+++ b/app/Http/Middleware/ConvertGetParameters.php
@@ -24,12 +24,14 @@ class ConvertGetParameters
      */
     public function handle($request, Closure $next)
     {
-        $min_length = Config::get('api.hashids.min_length');
+        $config = Config::get('api.app.hashids');
+
+        $min_length = $config['min_length'];
 
         $parameters = [
-            'category' => new Hashids(Config::get('api.hashids.category'), $min_length),
-            'subcategory' => new Hashids(Config::get('api.hashids.subcategory'), $min_length),
-            'resource-type' => new Hashids(Config::get('api.hashids.resource_type'), $min_length),
+            'category' => new Hashids($config['category'], $min_length),
+            'subcategory' => new Hashids($config['subcategory'], $min_length),
+            'resource-type' => new Hashids($config['resource_type'], $min_length),
         ];
 
         foreach ($parameters as $param => $hasher) {
diff --git a/app/Http/Middleware/ConvertRouteParameters.php b/app/Http/Middleware/ConvertRouteParameters.php
index df75ba52..e1d8755a 100644
--- a/app/Http/Middleware/ConvertRouteParameters.php
+++ b/app/Http/Middleware/ConvertRouteParameters.php
@@ -24,16 +24,19 @@ class ConvertRouteParameters
      */
     public function handle($request, Closure $next)
     {
-        $min_length = Config::get('api.hashids.min_length');
+        $config = Config::get('api.app.hashids');
+
+        $min_length = $config['min_length'];
 
         $route_params = [
-            'category_id' => new Hashids(Config::get('api.hashids.category'), $min_length),
-            'subcategory_id' => new Hashids(Config::get('api.hashids.subcategory'), $min_length),
-            'resource_type_id' => new Hashids(Config::get('api.hashids.resource_type'), $min_length),
-            'resource_id' => new Hashids(Config::get('api.hashids.resource'), $min_length),
-            'item_id' => new Hashids(Config::get('api.hashids.item'), $min_length),
-            'item_category_id' => new Hashids(Config::get('api.hashids.item_category'), $min_length),
-            'item_subcategory_id' => new Hashids(Config::get('api.hashids.item_subcategory'), $min_length),
+            'category_id' => new Hashids($config['category'], $min_length),
+            'subcategory_id' => new Hashids($config['subcategory'], $min_length),
+            'resource_type_id' => new Hashids($config['resource_type'], $min_length),
+            'resource_id' => new Hashids($config['resource'], $min_length),
+            'item_id' => new Hashids($config['item'], $min_length),
+            'item_category_id' => new Hashids($config['item_category'], $min_length),
+            'item_subcategory_id' => new Hashids($config['item_subcategory'], $min_length),
+            'item_type_id' => new Hashids($config['item_type'], $min_length),
         ];
 
         foreach ($route_params as $param => $hasher) {
diff --git a/app/Item/AbstractItem.php b/app/Item/AbstractItem.php
index 2772e61a..7e2abd1a 100644
--- a/app/Item/AbstractItem.php
+++ b/app/Item/AbstractItem.php
@@ -28,6 +28,22 @@ public function collectionParameters(): array
          return Config::get($this->collectionParametersConfig());
     }
 
+    /**
+     * Return the collection parameters specific to the item type, these will
+     * be merged with the default collection parameters
+     *
+     * @return array
+     */
+    public function collectionParametersKeys(): array
+    {
+        $params = [];
+        foreach (Config::get($this->collectionParametersConfig()) as $key => $param) {
+            $params[$param['parameter']] = null;
+        }
+
+        return $params;
+    }
+
     /**
      * Return the parameters config string specific to the item type
      *
@@ -35,6 +51,28 @@ public function collectionParameters(): array
      */
     abstract public function collectionParametersConfig(): string;
 
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    abstract public function conditionalParameterMinYear(int $resource_id): int;
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    abstract public function conditionalParameterMaxYear(int $resource_id): int;
+
     /**
      * Create an save the item type data
      *
@@ -67,17 +105,6 @@ abstract public function model(): Model;
      */
     abstract public function patchableFields(): array;
 
-    /**
-     * Return the patch fields specific to the item type, these will be merged
-     * with any default patch fields
-     *
-     * @return array
-     */
-    public function patchFields(): array
-    {
-        return Config::get($this->patchFields());
-    }
-
     /**
      * Return the patch fields config string specific to the item type
      *
@@ -85,17 +112,6 @@ public function patchFields(): array
      */
     abstract public function patchFieldsConfig(): string;
 
-    /**
-     * Return the post fields specific to the item type, these will be merged
-     * with any default post fields
-     *
-     * @return array
-     */
-    public function postFields(): array
-    {
-        return Config::get($this->postFieldsConfig());
-    }
-
     /**
      * Return the post fields config string specific to the item type
      *
@@ -103,76 +119,6 @@ public function postFields(): array
      */
     abstract public function postFieldsConfig(): string;
 
-    /**
-     * Return the collection parameters specific to the item type, these will
-     * be merged with the default collection parameters
-     *
-     * @return array
-     */
-    public function resourceTypeItemCollectionParameters(): array
-    {
-         return Config::get($this->resourceTypeItemCollectionParametersConfig());
-    }
-
-    /**
-     * Return the parameters config string specific to the item type
-     *
-     * @return string
-     */
-    abstract public function resourceTypeItemCollectionParametersConfig(): string;
-
-    /**
-     * Return the model instance for resource type item type
-     *
-     * @return Model
-     */
-    abstract public function resourceTypeItemModel(): Model;
-
-    /**
-     * Return the search parameters specific to the item type, these will be
-     * merged with any default search parameters
-     *
-     * @return array
-     */
-    public function resourceTypeItemSearchParameters(): array
-    {
-        return Config::get($this->resourceTypeItemSearchParametersConfig());
-    }
-
-    /**
-     * Return the search parameters config string specific to the item type
-     *
-     * @return string
-     */
-    abstract public function resourceTypeItemSearchParametersConfig(): string;
-
-    /**
-     * Return the sort parameters specific to the item type, these will be
-     * merged with any default sort parameters
-     *
-     * @return array
-     */
-    public function resourceTypeItemSortParameters(): array
-    {
-        return Config::get($this->resourceTypeItemSortParametersConfig());
-    }
-
-    /**
-     * Return the sort parameters config string specific to the item type
-     *
-     * @return string
-     */
-    abstract public function resourceTypeItemSortParametersConfig(): string;
-
-    /**
-     * Return the transformer for the specific item type
-     *
-     * @param array $data_to_transform
-     *
-     * @return Transformer
-     */
-    abstract public function resourceTypeItemTransformer(array $data_to_transform): Transformer;
-
     /**
      * Return the search parameters specific to the item type, these will be
      * merged with any default search parameters
@@ -191,17 +137,6 @@ public function searchParameters(): array
      */
     abstract public function searchParametersConfig(): string;
 
-    /**
-     * Return the show parameters specific to the item type, these will
-     * be merged with the default show parameters
-     *
-     * @return array
-     */
-    public function showParameters(): array
-    {
-         return Config::get($this->showParametersConfig());
-    }
-
     /**
      * Return the show parameters config string specific to the item type
      *
@@ -236,6 +171,13 @@ abstract public function sortParametersConfig(): string;
      */
     abstract public function transformer(array $data_to_transform): Transformer;
 
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    abstract public function type(): string;
+
     /**
      * Update the item type data
      *
diff --git a/app/Item/AllocatedExpense.php b/app/Item/AllocatedExpense.php
index b28f0ce8..adcb6607 100644
--- a/app/Item/AllocatedExpense.php
+++ b/app/Item/AllocatedExpense.php
@@ -3,10 +3,9 @@
 
 namespace App\Item;
 
-use App\Models\ItemTypeAllocatedExpense;
-use App\Models\ResourceTypeItemTypeAllocatedExpense;
+use App\Models\ItemType\AllocatedExpense as ItemModel;
 use App\Models\Transformers\Transformer;
-use App\Validators\Request\Fields\ItemTypeAllocatedExpense as ItemTypeAllocatedExpenseValidator;
+use App\Validators\Request\Fields\ItemType\AllocatedExpense as ItemTypeAllocatedExpenseValidator;
 use App\Validators\Request\Fields\Validator;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
@@ -31,6 +30,34 @@ public function collectionParametersConfig(): string
         return 'api.item-type-allocated-expense.parameters.collection';
     }
 
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMinYear(int $resource_id): int
+    {
+        return (new ItemModel())->minimumEffectiveDateYear($resource_id);
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMaxYear(int $resource_id): int
+    {
+        return (new ItemModel())->maximumEffectiveDateYear($resource_id);
+    }
+
     /**
      * Create an save the item type data
      *
@@ -40,7 +67,7 @@ public function collectionParametersConfig(): string
      */
     public function create($id): Model
     {
-        $item_type = new ItemTypeAllocatedExpense([
+        $item_type = new ItemModel([
             'item_id' => $id,
             'name' => request()->input('name'),
             'description' => request()->input('description', null),
@@ -69,7 +96,7 @@ public function create($id): Model
      */
     public function instance(int $id): Model
     {
-        return (new ItemTypeAllocatedExpense())->instance($id);
+        return (new ItemModel())->instance($id);
     }
 
     /**
@@ -79,7 +106,7 @@ public function instance(int $id): Model
      */
     public function model(): Model
     {
-        return new ItemTypeAllocatedExpense();
+        return new ItemModel();
     }
 
     /**
@@ -114,58 +141,6 @@ public function postFieldsConfig(): string
         return 'api.item-type-allocated-expense.fields';
     }
 
-    /**
-     * Return the parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemCollectionParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-allocated-expense.parameters.collection';
-    }
-
-    /**
-     * Return the model instance for resource type item type
-     *
-     * @return Model
-     */
-    public function resourceTypeItemModel(): Model
-    {
-        return new ResourceTypeItemTypeAllocatedExpense();
-    }
-
-    /**
-     * Return the transformer for the specific item type
-     *
-     * @param array $data_to_transform
-     *
-     * @return Transformer
-     */
-    public function resourceTypeItemTransformer(array $data_to_transform): Transformer
-    {
-        return new \App\Models\Transformers\ResourceTypeItemTypeAllocatedExpense($data_to_transform);
-    }
-
-    /**
-     * Return the search parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemSearchParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-allocated-expense.searchable';
-    }
-
-    /**
-     * Return the sort parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemSortParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-allocated-expense.sortable';
-    }
-
     /**
      * Return the search parameters config string specific to the item type
      *
@@ -205,7 +180,17 @@ public function sortParametersConfig(): string
      */
     public function transformer(array $data_to_transform): Transformer
     {
-        return new \App\Models\Transformers\ItemTypeAllocatedExpense($data_to_transform);
+        return new \App\Models\Transformers\ItemType\AllocatedExpense($data_to_transform);
+    }
+
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    public function type(): string
+    {
+        return 'allocated-expense';
     }
 
     /**
diff --git a/app/Item/ItemFactory.php b/app/Item/ItemFactory.php
deleted file mode 100644
index 02d790ef..00000000
--- a/app/Item/ItemFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Item;
-
-use App\Models\ResourceTypeItemType;
-use Exception;
-
-/**
- * Factory to help instantiating the relevant `item` class
- *
- * @author Dean Blackborough <dean@g3d-development.com>
- * @copyright G3D Development Limited 2018-2019
- * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
- */
-class ItemFactory
-{
-    /**
-     * Return the relevant item instance based on the provided resource type id,
-     * throws an exception if the item type interface cannot be returned
-     *
-     * @param integer $resource_type_id
-     *
-     * @return AbstractItem
-     * @throws Exception
-     */
-    static public function getItemInterface(
-        int $resource_type_id
-    ): AbstractItem
-    {
-        $item_type = (new ResourceTypeItemType())->itemType($resource_type_id);
-
-        if ($item_type !== null) {
-            switch ($item_type) {
-                case 'allocated-expense':
-                    return new AllocatedExpense();
-                    break;
-
-                case 'simple-expense':
-                    return new SimpleExpense();
-                    break;
-
-                default:
-                    throw new Exception('Unable to load the relevant item type', 500);
-                    break;
-            }
-        } else {
-            throw New Exception('No relevant item type defined for the resource type', 500);
-        }
-    }
-}
diff --git a/app/Item/ItemInterfaceFactory.php b/app/Item/ItemInterfaceFactory.php
new file mode 100644
index 00000000..7077caa6
--- /dev/null
+++ b/app/Item/ItemInterfaceFactory.php
@@ -0,0 +1,227 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item;
+
+use App\Models\ResourceTypeItemType;
+use Exception;
+
+/**
+ * Factory to help instantiating the relevant `item` class
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ItemInterfaceFactory
+{
+    /**
+     * @param int $resource_type_id
+     *
+     * @return string
+     */
+    static protected function itemType(int $resource_type_id)
+    {
+        return (new ResourceTypeItemType())->itemType($resource_type_id);
+    }
+
+    /**
+     * Return the relevant item instance based on the provided resource type id,
+     * throws an exception if the item type interface cannot be returned
+     *
+     * @param integer $resource_type_id
+     *
+     * @return AbstractItem
+     * @throws Exception
+     */
+    static protected function itemInterface(
+        int $resource_type_id
+    ): AbstractItem
+    {
+        $item_type = self::itemType($resource_type_id);
+
+        if ($item_type !== null) {
+            switch ($item_type) {
+                case 'allocated-expense':
+                    return new AllocatedExpense();
+                    break;
+
+                case 'simple-expense':
+                    return new SimpleExpense();
+                    break;
+
+                default:
+                    throw new Exception('Unable to load the relevant item type', 500);
+                    break;
+            }
+        } else {
+            throw New Exception('No relevant item type defined for the resource type', 500);
+        }
+    }
+
+    /**
+     * Return the relevant item summary instance based on the provided resource
+     * type id, throws an exception if the item type interface cannot be returned
+     *
+     * @param integer $resource_type_id
+     *
+     * @return Summary\AbstractItem
+     * @throws Exception
+     */
+    static protected function itemSummaryInterface(
+        int $resource_type_id
+    ): Summary\AbstractItem
+    {
+        $item_type = self::itemType($resource_type_id);
+
+        if ($item_type !== null) {
+            switch ($item_type) {
+                case 'allocated-expense':
+                    return new Summary\AllocatedExpense();
+                    break;
+
+                case 'simple-expense':
+                    return new Summary\SimpleExpense();
+                    break;
+
+                default:
+                    throw new Exception('Unable to load the relevant summary item type', 500);
+                    break;
+            }
+        } else {
+            throw New Exception('No relevant summary item type defined for the resource type', 500);
+        }
+    }
+
+    /**
+     * Return the relevant item instance based on the provided resource type id,
+     * throws an exception if the item type interface cannot be returned
+     *
+     * @param integer $resource_type_id
+     *
+     * @return ResourceTypeItem\AbstractItem
+     * @throws Exception
+     */
+    static protected function resourceTypeItemInterface(
+        int $resource_type_id
+    ): ResourceTypeItem\AbstractItem
+    {
+        $item_type = self::itemType($resource_type_id);
+
+        if ($item_type !== null) {
+            switch ($item_type) {
+                case 'allocated-expense':
+                    return new ResourceTypeItem\AllocatedExpense();
+                    break;
+
+                case 'simple-expense':
+                    return new ResourceTypeItem\SimpleExpense();
+                    break;
+
+                default:
+                    throw new Exception('Unable to load the relevant resource type item type', 500);
+                    break;
+            }
+        } else {
+            throw New Exception('No relevant resource type item type defined for the resource type', 500);
+        }
+    }
+
+    /**
+     * Return the relevant item instance based on the provided resource type id,
+     * throws an exception if the item type interface cannot be returned
+     *
+     * @param integer $resource_type_id
+     *
+     * @return ResourceTypeItem\Summary\AbstractItem
+     * @throws Exception
+     */
+    static protected function resourceTypeItemSummaryInterface(
+        int $resource_type_id
+    ): ResourceTypeItem\Summary\AbstractItem
+    {
+        $item_type = self::itemType($resource_type_id);
+
+        if ($item_type !== null) {
+            switch ($item_type) {
+                case 'allocated-expense':
+                    return new ResourceTypeItem\Summary\AllocatedExpense();
+                    break;
+
+                case 'simple-expense':
+                    return new ResourceTypeItem\Summary\SimpleExpense();
+                    break;
+
+                default:
+                    throw new Exception('Unable to load the relevant resource type item summary type', 500);
+                    break;
+            }
+        } else {
+            throw New Exception('No relevant resource type item summary type defined for the resource type', 500);
+        }
+    }
+
+    /**
+     * Return the relevant item interface
+     *
+     * @param integer $resource_type_id
+     *
+     * @return AbstractItem
+     */
+    static public function item(int $resource_type_id): AbstractItem
+    {
+        try {
+            return self::itemInterface($resource_type_id);
+        } catch (Exception $e) {
+            abort(500, $e->getMessage());
+        }
+    }
+
+    /**
+     * Return the relevant item interface
+     *
+     * @param integer $resource_type_id
+     *
+     * @return Summary\AbstractItem
+     */
+    static public function summaryItem(int $resource_type_id): Summary\AbstractItem
+    {
+        try {
+            return self::itemSummaryInterface($resource_type_id);
+        } catch (Exception $e) {
+            abort(500, $e->getMessage());
+        }
+    }
+
+    /**
+     * Return the relevant resource type item interface
+     *
+     * @param integer $resource_type_id
+     *
+     * @return \App\Item\ResourceTypeItem\AbstractItem
+     */
+    static public function resourceTypeItem(int $resource_type_id): \App\Item\ResourceTypeItem\AbstractItem
+    {
+        try {
+            return self::resourceTypeItemInterface($resource_type_id);
+        } catch (Exception $e) {
+            abort(500, $e->getMessage());
+        }
+    }
+
+    /**
+     * Return the relevant resource type item summary interface
+     *
+     * @param integer $resource_type_id
+     *
+     * @return \App\Item\ResourceTypeItem\Summary\AbstractItem
+     */
+    static public function summaryResourceTypeItem(int $resource_type_id): \App\Item\ResourceTypeItem\Summary\AbstractItem
+    {
+        try {
+            return self::resourceTypeItemSummaryInterface($resource_type_id);
+        } catch (Exception $e) {
+            abort(500, $e->getMessage());
+        }
+    }
+}
diff --git a/app/Item/ResourceTypeItem/AbstractItem.php b/app/Item/ResourceTypeItem/AbstractItem.php
new file mode 100644
index 00000000..2f3b19bb
--- /dev/null
+++ b/app/Item/ResourceTypeItem/AbstractItem.php
@@ -0,0 +1,133 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem;
+
+use App\Models\Transformers\Transformer;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Base class for each item type, contains the required methods
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+abstract class AbstractItem
+{
+    /**
+     * Return the collection parameters specific to the item type, these will
+     * be merged with the default collection parameters
+     *
+     * @return array
+     */
+    public function collectionParameters(): array
+    {
+         return Config::get($this->collectionParametersConfig());
+    }
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function collectionParametersConfig(): string;
+
+    /**
+     * Return the collection parameters specific to the item type, these will
+     * be merged with the default collection parameters
+     *
+     * @return array
+     */
+    public function collectionParametersKeys(): array
+    {
+        $params = [];
+        foreach (Config::get($this->collectionParametersConfig()) as $key => $param) {
+            $params[$param['parameter']] = null;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    abstract public function conditionalParameterMinYear(int $resource_type_id): int;
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    abstract public function conditionalParameterMaxYear(int $resource_type_id): int;
+
+    /**
+     * Return the model instance for resource type item type
+     *
+     * @return Model
+     */
+    abstract public function model(): Model;
+
+    /**
+     * Return the search parameters specific to the item type, these will be
+     * merged with any default search parameters
+     *
+     * @return array
+     */
+    public function searchParameters(): array
+    {
+        return Config::get($this->searchParametersConfig());
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function searchParametersConfig(): string;
+
+    /**
+     * Return the sort parameters specific to the item type, these will be
+     * merged with any default sort parameters
+     *
+     * @return array
+     */
+    public function sortParameters(): array
+    {
+        return Config::get($this->sortParametersConfig());
+    }
+
+    /**
+     * Return the sort parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function sortParametersConfig(): string;
+
+    /**
+     * Return the transformer for the specific item type
+     *
+     * @param array $data_to_transform
+     *
+     * @return Transformer
+     */
+    abstract public function transformer(array $data_to_transform): Transformer;
+
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    abstract public function type(): string;
+}
diff --git a/app/Item/ResourceTypeItem/AllocatedExpense.php b/app/Item/ResourceTypeItem/AllocatedExpense.php
new file mode 100644
index 00000000..60490b2d
--- /dev/null
+++ b/app/Item/ResourceTypeItem/AllocatedExpense.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem;
+
+use App\Models\ResourceTypeItemType\AllocatedExpense as ItemModel;
+use App\Models\Transformers\Transformer;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * The Interface for dealing with allocated expenses, everything should be
+ * funneled through an instance of this class
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class AllocatedExpense extends AbstractItem
+{
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-allocated-expense.parameters.collection';
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMinYear(int $resource_type_id): int
+    {
+        return (new ItemModel())->minimumEffectiveDateYear($resource_type_id);
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMaxYear(int $resource_type_id): int
+    {
+        return (new ItemModel())->maximumEffectiveDateYear($resource_type_id);
+    }
+
+    /**
+     * Return the model instance for resource type item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel();
+    }
+
+    /**
+     * Return the transformer for the specific item type
+     *
+     * @param array $data_to_transform
+     *
+     * @return Transformer
+     */
+    public function transformer(array $data_to_transform): Transformer
+    {
+        return new \App\Models\Transformers\ResourceTypeItemType\AllocatedExpense($data_to_transform);
+    }
+
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    public function type(): string
+    {
+        return 'allocated-expense';
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-allocated-expense.searchable';
+    }
+
+    /**
+     * Return the sort parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function sortParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-allocated-expense.sortable';
+    }
+}
diff --git a/app/Item/ResourceTypeItem/SimpleExpense.php b/app/Item/ResourceTypeItem/SimpleExpense.php
new file mode 100644
index 00000000..6834080a
--- /dev/null
+++ b/app/Item/ResourceTypeItem/SimpleExpense.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem;
+
+use App\Models\ResourceTypeItemType\SimpleExpense as ItemModel;
+use App\Models\Transformers\Transformer;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * The Interface for dealing with simple expenses, everything should be
+ * funneled through an instance of this class
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class SimpleExpense extends AbstractItem
+{
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-simple-expense.parameters.collection';
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMinYear(int $resource_type_id): int
+    {
+        return (new ItemModel())->minimumEffectiveDateYear($resource_type_id);
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMaxYear(int $resource_type_id): int
+    {
+        return (new ItemModel())->maximumEffectiveDateYear($resource_type_id);
+    }
+
+    /**
+     * Return the model instance for resource type item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel();
+    }
+
+    /**
+     * Return the transformer for the specific item type
+     *
+     * @param array $data_to_transform
+     *
+     * @return Transformer
+     */
+    public function transformer(array $data_to_transform): Transformer
+    {
+        return new \App\Models\Transformers\ResourceTypeItemType\SimpleExpense($data_to_transform);
+    }
+
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    public function type(): string
+    {
+        return 'simple-expense';
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-simple-expense.searchable';
+    }
+
+    /**
+     * Return the sort parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function sortParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-simple-expense.sortable';
+    }
+}
diff --git a/app/Item/ResourceTypeItem/Summary/AbstractItem.php b/app/Item/ResourceTypeItem/Summary/AbstractItem.php
new file mode 100644
index 00000000..37fe0f64
--- /dev/null
+++ b/app/Item/ResourceTypeItem/Summary/AbstractItem.php
@@ -0,0 +1,64 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem\Summary;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Base class for each item type, contains the required methods
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+abstract class AbstractItem
+{
+    /**
+     * Return the collection parameters specific to the item type
+     *
+     * @return array
+     */
+    public function collectionParametersKeys(): array
+    {
+        $params = [];
+        foreach (Config::get($this->collectionParametersConfig()) as $key => $param) {
+            $params[] = $param['parameter'];
+        }
+
+        return $params;
+    }
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function collectionParametersConfig(): string;
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    abstract public function model(): Model;
+
+    /**
+     * Return the search parameters specific to the item type, these will be
+     * merged with any default search parameters
+     *
+     * @return array
+     */
+    public function searchParameters(): array
+    {
+        return Config::get($this->searchParametersConfig());
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function searchParametersConfig(): string;
+}
diff --git a/app/Item/ResourceTypeItem/Summary/AllocatedExpense.php b/app/Item/ResourceTypeItem/Summary/AllocatedExpense.php
new file mode 100644
index 00000000..76a625e1
--- /dev/null
+++ b/app/Item/ResourceTypeItem/Summary/AllocatedExpense.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem\Summary;
+
+use App\Models\ResourceTypeItemType\Summary\AllocatedExpense as ItemModel;
+use Illuminate\Database\Eloquent\Model;
+
+class AllocatedExpense extends AbstractItem
+{
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-allocated-expense.summary-parameters.collection';
+    }
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel;
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-allocated-expense.summary-searchable';
+    }
+}
diff --git a/app/Item/ResourceTypeItem/Summary/SimpleExpense.php b/app/Item/ResourceTypeItem/Summary/SimpleExpense.php
new file mode 100644
index 00000000..b7a9f0ef
--- /dev/null
+++ b/app/Item/ResourceTypeItem/Summary/SimpleExpense.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\ResourceTypeItem\Summary;
+
+use App\Models\ResourceTypeItemType\Summary\SimpleExpense as ItemModel;
+use Illuminate\Database\Eloquent\Model;
+
+class SimpleExpense extends AbstractItem
+{
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-simple-expense.summary-parameters.collection';
+    }
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel;
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.resource-type-item-type-simple-expense.summary-searchable';
+    }
+}
diff --git a/app/Item/SimpleExpense.php b/app/Item/SimpleExpense.php
index e704aabf..c6958da6 100644
--- a/app/Item/SimpleExpense.php
+++ b/app/Item/SimpleExpense.php
@@ -3,10 +3,9 @@
 
 namespace App\Item;
 
-use App\Models\ItemTypeSimpleExpense;
-use App\Models\ResourceTypeItemTypeSimpleExpense;
+use App\Models\ItemType\SimpleExpense as ItemModel;
 use App\Models\Transformers\Transformer;
-use App\Validators\Request\Fields\ItemTypeSimpleExpense as ItemTypeSimpleExpenseValidator;
+use App\Validators\Request\Fields\ItemType\SimpleExpense as ItemTypeSimpleExpenseValidator;
 use App\Validators\Request\Fields\Validator;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
@@ -31,6 +30,34 @@ public function collectionParametersConfig(): string
         return 'api.item-type-simple-expense.parameters.collection';
     }
 
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMinYear(int $resource_id): int
+    {
+        return (new ItemModel())->minimumEffectiveDateYear($resource_id);
+    }
+
+    /**
+     * Return the minimum year for the conditional year filter, reviews the
+     * item type data and returns the min value, if no data exists, defaults to
+     * the current year
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function conditionalParameterMaxYear(int $resource_id): int
+    {
+        return (new ItemModel())->maximumEffectiveDateYear($resource_id);
+    }
+
     /**
      * Create an save the item type data
      *
@@ -40,7 +67,7 @@ public function collectionParametersConfig(): string
      */
     public function create($id): Model
     {
-        $item_type = new ItemTypeSimpleExpense([
+        $item_type = new ItemModel([
             'item_id' => $id,
             'name' => request()->input('name'),
             'description' => request()->input('description', null),
@@ -62,7 +89,7 @@ public function create($id): Model
      */
     public function instance(int $id): Model
     {
-        return (new ItemTypeSimpleExpense())->instance($id);
+        return (new ItemModel())->instance($id);
     }
 
     /**
@@ -72,7 +99,7 @@ public function instance(int $id): Model
      */
     public function model(): Model
     {
-        return new ItemTypeSimpleExpense();
+        return new ItemModel();
     }
 
     /**
@@ -107,58 +134,6 @@ public function postFieldsConfig(): string
         return 'api.item-type-simple-expense.fields';
     }
 
-    /**
-     * Return the parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemCollectionParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-simple-expense.parameters.collection';
-    }
-
-    /**
-     * Return the model instance for resource type item type
-     *
-     * @return Model
-     */
-    public function resourceTypeItemModel(): Model
-    {
-        return new ResourceTypeItemTypeSimpleExpense();
-    }
-
-    /**
-     * Return the transformer for the specific item type
-     *
-     * @param array $data_to_transform
-     *
-     * @return Transformer
-     */
-    public function resourceTypeItemTransformer(array $data_to_transform): Transformer
-    {
-        return new \App\Models\Transformers\ResourceTypeItemTypeSimpleExpense($data_to_transform);
-    }
-
-    /**
-     * Return the search parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemSearchParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-simple-expense.searchable';
-    }
-
-    /**
-     * Return the sort parameters config string specific to the item type
-     *
-     * @return string
-     */
-    public function resourceTypeItemSortParametersConfig(): string
-    {
-        return 'api.resource-type-item-type-simple-expense.sortable';
-    }
-
     /**
      * Return the search parameters config string specific to the item type
      *
@@ -198,7 +173,17 @@ public function sortParametersConfig(): string
      */
     public function transformer(array $data_to_transform): Transformer
     {
-        return new \App\Models\Transformers\ItemTypeSimpleExpense($data_to_transform);
+        return new \App\Models\Transformers\ItemType\SimpleExpense($data_to_transform);
+    }
+
+    /**
+     * Return the item type identifier
+     *
+     * @return string
+     */
+    public function type(): string
+    {
+        return 'simple-expense';
     }
 
     /**
diff --git a/app/Item/Summary/AbstractItem.php b/app/Item/Summary/AbstractItem.php
new file mode 100644
index 00000000..303b8b19
--- /dev/null
+++ b/app/Item/Summary/AbstractItem.php
@@ -0,0 +1,64 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\Summary;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Base class for each item type, contains the required methods
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+abstract class AbstractItem
+{
+    /**
+     * Return the collection parameters specific to the item type
+     *
+     * @return array
+     */
+    public function collectionParametersKeys(): array
+    {
+        $params = [];
+        foreach (Config::get($this->collectionParametersConfig()) as $key => $param) {
+            $params[] = $param['parameter'];
+        }
+
+        return $params;
+    }
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function collectionParametersConfig(): string;
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    abstract public function model(): Model;
+
+    /**
+     * Return the search parameters specific to the item type, these will be
+     * merged with any default search parameters
+     *
+     * @return array
+     */
+    public function searchParameters(): array
+    {
+        return Config::get($this->searchParametersConfig());
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    abstract public function searchParametersConfig(): string;
+}
diff --git a/app/Item/Summary/AllocatedExpense.php b/app/Item/Summary/AllocatedExpense.php
new file mode 100644
index 00000000..bd4aa0b8
--- /dev/null
+++ b/app/Item/Summary/AllocatedExpense.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\Summary;
+
+use App\Models\Summary\ItemType\AllocatedExpense as ItemModel;
+use Illuminate\Database\Eloquent\Model;
+
+class AllocatedExpense extends AbstractItem
+{
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.item-type-allocated-expense.summary-parameters.collection';
+    }
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel;
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.item-type-allocated-expense.summary-searchable';
+    }
+}
diff --git a/app/Item/Summary/SimpleExpense.php b/app/Item/Summary/SimpleExpense.php
new file mode 100644
index 00000000..cb92928a
--- /dev/null
+++ b/app/Item/Summary/SimpleExpense.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Item\Summary;
+
+use App\Models\Summary\ItemType\SimpleExpense as ItemModel;
+use Illuminate\Database\Eloquent\Model;
+
+class SimpleExpense extends AbstractItem
+{
+
+    /**
+     * Return the parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function collectionParametersConfig(): string
+    {
+        return 'api.item-type-simple-expense.summary-parameters.collection';
+    }
+
+    /**
+     * Return the model instance for the item type
+     *
+     * @return Model
+     */
+    public function model(): Model
+    {
+        return new ItemModel;
+    }
+
+    /**
+     * Return the search parameters config string specific to the item type
+     *
+     * @return string
+     */
+    public function searchParametersConfig(): string
+    {
+        return 'api.item-type-simple-expense.summary-searchable';
+    }
+}
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 92921fa0..bd14420e 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -12,11 +12,6 @@
 /**
  * Category model
  *
- * Single() exists in this model to be consistent with all the other models, it
- * is simply a synonym for find().
- *
- * Categories are private if they are related to a private resource type
- *
  * @mixin QueryBuilder
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
@@ -53,7 +48,7 @@ public function patchableFields(): array
      *
      * @return integer
      */
-    public function totalCount(
+    public function total(
         int $resource_type_id,
         array $permitted_resource_types,
         bool $include_public,
@@ -233,36 +228,4 @@ public function instanceToArray(Category $category): array
             'resource_type_id' => $category->resource_type_id
         ];
     }
-
-    /**
-     * Validate that the category exists and is accessible to the user for
-     * viewing, editing based on their permitted resource types
-     *
-     * @param integer $resource_type_id
-     * @param integer $category_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_type_id,
-        int $category_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->where('category.id', '=', $category_id)->
-            join('resource_type', 'category.resource_type_id', 'resource_type.id')->
-            where('category.resource_type_id', '=', $resource_type_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/Item.php b/app/Models/Item.php
index 27bc4447..e23a29b7 100644
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -3,12 +3,8 @@
 
 namespace App\Models;
 
-use App\Utilities\General;
-use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\DB;
 
 /**
  * Item model
@@ -43,40 +39,4 @@ public function instance(
             )
             ->find($item_id);
     }
-
-    /**
-     * Validate that the item exists and is accessible to the user for
-     * viewing, editing etc. based on their permitted resource types
-     *
-     * @param integer $resource_type_id
-     * @param integer $resource_id
-     * @param integer $item_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_type_id,
-        int $resource_id,
-        int $item_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource.resource_type_id', '=', $resource_type_id)->
-            where('resource.id', '=', $resource_id)->
-            where('item.id', '=', $item_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/ItemCategory.php b/app/Models/ItemCategory.php
index 20c9e8da..b6ea5d01 100644
--- a/app/Models/ItemCategory.php
+++ b/app/Models/ItemCategory.php
@@ -3,7 +3,6 @@
 
 namespace App\Models;
 
-use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -121,44 +120,4 @@ public function instanceToArray(ItemCategory $item_category): array
             'item_category_category_description' => $item_category->category->description
         ];
     }
-
-    /**
-     * Validate that the item exists and is accessible to the user for
-     * viewing, editing etc. based on their permitted resource types
-     *
-     * @param integer $resource_type_id
-     * @param integer $resource_id
-     * @param integer $item_id
-     * @param integer $item_category_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_type_id,
-        int $resource_id,
-        int $item_id,
-        int $item_category_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->join('item', 'item_category.item_id', 'item.id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource.resource_type_id', '=', $resource_type_id)->
-            where('resource.id', '=', $resource_id)->
-            where('item.id', '=', $item_id)->
-            where('item_category.id', '=', $item_category_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/ItemSubCategory.php b/app/Models/ItemSubcategory.php
similarity index 71%
rename from app/Models/ItemSubCategory.php
rename to app/Models/ItemSubcategory.php
index f074fc59..99bf677f 100644
--- a/app/Models/ItemSubCategory.php
+++ b/app/Models/ItemSubcategory.php
@@ -3,7 +3,6 @@
 
 namespace App\Models;
 
-use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -15,7 +14,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategory extends Model
+class ItemSubcategory extends Model
 {
     protected $table = 'item_sub_category';
 
@@ -23,7 +22,7 @@ class ItemSubCategory extends Model
 
     public function sub_category()
     {
-        return $this->hasOne(SubCategory::class, 'id', 'sub_category_id');
+        return $this->hasOne(Subcategory::class, 'id', 'sub_category_id');
     }
 
     public function item()
@@ -100,7 +99,7 @@ public function instance(
         int $item_id,
         int $item_category_id,
         int $item_subcategory_id
-    ): ?ItemSubCategory
+    ): ?ItemSubcategory
     {
         return $this->join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id')->
             join('item_category', 'item_sub_category.item_category_id', 'item_category.id')->
@@ -122,11 +121,11 @@ public function instance(
     /**
      * Convert the model instance to an array for use with the transformer
      *
-     * @param ItemSubCategory $item_sub_category
+     * @param ItemSubcategory $item_sub_category
      *
      * @return array
      */
-    public function instanceToArray(ItemSubCategory $item_sub_category): array
+    public function instanceToArray(ItemSubcategory $item_sub_category): array
     {
         return [
             'item_sub_category_id' => $item_sub_category->id,
@@ -135,48 +134,4 @@ public function instanceToArray(ItemSubCategory $item_sub_category): array
             'item_sub_category_sub_category_description' => $item_sub_category->sub_category->description
         ];
     }
-
-    /**
-     * Validate that the item exists and is accessible to the user for
-     * viewing, editing etc. based on their permitted resource types
-     *
-     * @param integer $resource_type_id
-     * @param integer $resource_id
-     * @param integer $item_id
-     * @param integer $item_category_id
-     * @param integer $item_subcategory_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_type_id,
-        int $resource_id,
-        int $item_id,
-        int $item_category_id,
-        int $item_subcategory_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->join('item_category', 'item_sub_category.item_category_id', 'item_category.id')->
-            join('item', 'item_category.item_id', 'item.id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource.resource_type_id', '=', $resource_type_id)->
-            where('resource.id', '=', $resource_id)->
-            where('item.id', '=', $item_id)->
-            where('item_category.id', '=', $item_category_id)->
-            where('item_sub_category.id', '=', $item_subcategory_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/ItemType.php b/app/Models/ItemType.php
index 99420fe4..48e73df2 100644
--- a/app/Models/ItemType.php
+++ b/app/Models/ItemType.php
@@ -3,6 +3,7 @@
 
 namespace App\Models;
 
+use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -35,4 +36,88 @@ public function minimisedCollection(): array
             get()->
             toArray();
     }
+
+    /**
+     * Return the paginated collection
+     *
+     * @param integer $offset Paging offset
+     * @param integer $limit Paging limit
+     * @param array $search_parameters
+     * @param array $sort_parameters
+     *
+     * @return array
+     */
+    public function paginatedCollection(
+        int $offset = 0,
+        int $limit = 10,
+        array $search_parameters = [],
+        array $sort_parameters = []
+    ): array
+    {
+        $collection = $this->select(
+            'item_type.id AS item_type_id',
+            'item_type.name AS item_type_name',
+            'item_type.description AS item_type_description',
+            'item_type.created_at AS item_type_created_at'
+        );
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        if (count($sort_parameters) > 0) {
+            foreach ($sort_parameters as $field => $direction) {
+                switch ($field) {
+                    case 'created':
+                        $collection->orderBy('item_type.created_at', $direction);
+                        break;
+
+                    default:
+                        $collection->orderBy('item_type.' . $field, $direction);
+                        break;
+                }
+            }
+        } else {
+            $collection->orderByDesc('item_type.created_at');
+        }
+
+        $collection->offset($offset);
+        $collection->limit($limit);
+
+        return $collection->get()->toArray();
+    }
+
+    /**
+     * Return a single item type
+     *
+     * @param integer $item_type_id
+     *
+     * @return array
+     */
+    public function single(int $item_type_id): array
+    {
+        $result = $this->select(
+            'item_type.id AS item_type_id',
+            'item_type.name AS item_type_name',
+            'item_type.description AS item_type_description',
+            'item_type.created_at AS item_type_created_at'
+        );
+
+        return $result->find($item_type_id)->
+            toArray();
+    }
+
+    /**
+     * Return the total number of item types
+     *
+     * @param array $search_parameters = []
+     *
+     * @return integer
+     */
+    public function totalCount(array $search_parameters = []): int
+    {
+        $collection = $this->select("item_type.id");
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        return $collection->count();
+    }
 }
diff --git a/app/Models/ItemTypeAllocatedExpense.php b/app/Models/ItemType/AllocatedExpense.php
similarity index 88%
rename from app/Models/ItemTypeAllocatedExpense.php
rename to app/Models/ItemType/AllocatedExpense.php
index f42a93bb..c37d5c0c 100644
--- a/app/Models/ItemTypeAllocatedExpense.php
+++ b/app/Models/ItemType/AllocatedExpense.php
@@ -1,13 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models;
+namespace App\Models\ItemType;
 
 use App\Utilities\General;
 use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -18,7 +17,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeAllocatedExpense extends Model
+class AllocatedExpense extends Model
 {
     protected $table = 'item_type_allocated_expense';
 
@@ -29,7 +28,7 @@ public function setActualisedTotal($total, $percentage)
         $this->attributes['actualised_total'] = ($percentage === 100) ? $total : $total * ($percentage/100);
     }
 
-    public function instance(int $item_id): ?ItemTypeAllocatedExpense
+    public function instance(int $item_id): ?AllocatedExpense
     {
         return $this->where('item_id', '=', $item_id)->
             select(
@@ -79,15 +78,60 @@ public function single(
         }
     }
 
+    /**
+     * Work out the maximum effective date year for the requested resource id,
+     * defaults to the current year if no data exists
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function maximumEffectiveDateYear(int $resource_id): int
+    {
+        $result = $this->join('item', 'item_type_allocated_expense.item_id', 'item.id')->
+            where('item.resource_id', '=', $resource_id)->
+            selectRaw('YEAR(MAX(`item_type_allocated_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+
+    }
+
+    /**
+     * Work out the minimum effective date year for the requested resource id,
+     * defaults to the current year if no data exists
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function minimumEffectiveDateYear(int $resource_id): int
+    {
+        $result = $this->join('item', 'item_type_allocated_expense.item_id', 'item.id')->
+            where('item.resource_id', '=', $resource_id)->
+            selectRaw('YEAR(MIN(`item_type_allocated_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
     /**
      * Convert the model instance to an array for use with the transformer
      *
-     * @param Item $item
+     * @param $item
      * @param Model $item_type
      *
      * @return array
      */
-    public function instanceToArray(Item $item, Model $item_type): array
+    public function instanceToArray($item, Model $item_type): array
     {
         return [
             'item_id' => $item->id,
diff --git a/app/Models/ItemTypeSimpleExpense.php b/app/Models/ItemType/SimpleExpense.php
similarity index 86%
rename from app/Models/ItemTypeSimpleExpense.php
rename to app/Models/ItemType/SimpleExpense.php
index 1d923279..4ffa8b58 100644
--- a/app/Models/ItemTypeSimpleExpense.php
+++ b/app/Models/ItemType/SimpleExpense.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models;
+namespace App\Models\ItemType;
 
 use App\Utilities\General;
 use App\Utilities\Model as ModelUtility;
@@ -17,13 +17,13 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeSimpleExpense extends Model
+class SimpleExpense extends Model
 {
     protected $table = 'item_type_simple_expense';
 
     protected $guarded = ['id', 'updated_at', 'created_at'];
 
-    public function instance(int $item_id): ?ItemTypeSimpleExpense
+    public function instance(int $item_id): ?SimpleExpense
     {
         return $this->where('item_id', '=', $item_id)->
             select(
@@ -35,12 +35,12 @@ public function instance(int $item_id): ?ItemTypeSimpleExpense
     /**
      * Convert the model instance to an array for use with the transformer
      *
-     * @param Item $item
+     * @param $item
      * @param Model $item_type
      *
      * @return array
      */
-    public function instanceToArray(Item $item, Model $item_type): array
+    public function instanceToArray($item, Model $item_type): array
     {
         return [
             'item_id' => $item->id,
@@ -150,6 +150,51 @@ public function totalCount(
         return $collection->count();
     }
 
+    /**
+     * Work out the maximum effective date year for the requested resource id,
+     * defaults to the current year if no data exists
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function maximumEffectiveDateYear(int $resource_id): int
+    {
+        $result = $this->join('item', 'item_type_simple_expense.item_id', 'item.id')->
+            where('item.resource_id', '=', $resource_id)->
+            selectRaw('YEAR(MAX(`item_type_simple_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+
+    }
+
+    /**
+     * Work out the minimum effective date year for the requested resource id,
+     * defaults to the current year if no data exists
+     *
+     * @param integer $resource_id
+     *
+     * @return integer
+     */
+    public function minimumEffectiveDateYear(int $resource_id): int
+    {
+        $result = $this->join('item', 'item_type_simple_expense.item_id', 'item.id')->
+            where('item.resource_id', '=', $resource_id)->
+            selectRaw('YEAR(MIN(`item_type_simple_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
     /**
      * Return the results for the given request based on the supplied parameters
      *
diff --git a/app/Models/PermittedUser.php b/app/Models/PermittedUser.php
index 82d69dea..d9752276 100644
--- a/app/Models/PermittedUser.php
+++ b/app/Models/PermittedUser.php
@@ -3,9 +3,9 @@
 
 namespace App\Models;
 
+use App\Utilities\Model as ModelUtility;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Support\Facades\DB;
 
 /**
  * Error log
@@ -27,7 +27,7 @@ class PermittedUser extends Model
      * @param integer $resource_type_id
      * @param integer $user_id
      *
-     * @return PermittedUser|null
+     * @return ResourceTypeAccess|null
      */
     public function instance(int $resource_type_id, int $user_id): ?PermittedUser
     {
@@ -37,25 +37,73 @@ public function instance(int $resource_type_id, int $user_id): ?PermittedUser
     }
 
     /**
-     * Fetch all the resource types the user has access to
+     * Return the total number of permitted users for the resource type
      *
-     * @param integer $user_id
+     * @param integer $resource_type_id
+     * @param array $search_parameters
+     *
+     * @return integer
+     */
+    public function totalCount(
+        int $resource_type_id,
+        array $search_parameters = []
+    ): int
+    {
+        $collection = $this->select("permitted_user.id")->
+            join('users', 'permitted_user.user_id', 'users.id')->
+            where('permitted_user.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applySearch($collection, 'users', $search_parameters);
+
+        return $collection->count('permitted_user.id');
+    }
+
+    /**
+     * Return the permitted users based on the given conditions
+     *
+     * @param integer $resource_type_id
+     * @param integer $offset
+     * @param integer $limit
+     * @param array $search_parameters
+     * @param array $sort_parameters
      *
      * @return array
      */
-    public function permittedResourceTypes(int $user_id): array
+    public function paginatedCollection(
+        int $resource_type_id,
+        int $offset = 0,
+        int $limit = 10,
+        array $search_parameters = [],
+        array $sort_parameters = []
+    ): array
     {
-        $permitted = [];
+        $collection = $this->select(
+                'permitted_user.id AS permitted_user_id',
+                'users.name AS permitted_user_name',
+                'users.email AS permitted_user_email',
+                'permitted_user.created_at AS permitted_user_created_at'
+            )->
+            join('users', 'permitted_user.user_id', 'users.id')->
+            where('permitted_user.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applySearch($collection, 'users', $search_parameters);
 
-        $results = $this->where('user_id', '=', $user_id)->
-            select('resource_type_id')->
-            get()->
-            toArray();
+        if (count($sort_parameters) > 0) {
+            foreach ($sort_parameters as $field => $direction) {
+                switch ($field) {
+                    case 'created':
+                        $collection->orderBy('permitted_user.created_at', $direction);
+                        break;
 
-        foreach ($results as $row) {
-            $permitted[] = $row['resource_type_id'];
+                    default:
+                        $collection->orderBy('users.' . $field, $direction);
+                        break;
+                }
+            }
+        } else {
+            $collection->orderBy('permitted_user.created_at', 'desc');
         }
 
-        return $permitted;
+        return $collection->offset($offset)->limit($limit)->get()->toArray();
     }
 }
diff --git a/app/Models/RequestLog.php b/app/Models/RequestLog.php
index c514f944..b5a01c28 100644
--- a/app/Models/RequestLog.php
+++ b/app/Models/RequestLog.php
@@ -5,7 +5,6 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Support\Facades\DB;
 
 /**
  * Request log
@@ -50,28 +49,4 @@ public function paginatedCollection(
             get()->
             toArray();
     }
-
-    /**
-     * @param array $collection_parameters
-     *
-     * @return array
-     */
-    public function monthlyRequests(array $collection_parameters = []): array
-    {
-        $collection = $this->orderBy(DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"))
-            ->groupBy(DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"));
-
-        if (array_key_exists('source', $collection_parameters) === true) {
-            $collection->where("source", '=', $collection_parameters['source']);
-        }
-
-        $collection->select(
-            DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"),
-            DB::raw("COUNT(`request_log`.`id`) AS `requests`"),
-            DB::raw("ANY_VALUE(DATE_FORMAT(`request_log`.`created_at`, '%Y')) AS `year`"),
-            DB::raw("ANY_VALUE(DATE_FORMAT(`request_log`.`created_at`, '%M')) AS `month`")
-        );
-
-        return $collection->get()->toArray();
-    }
 }
diff --git a/app/Models/Resource.php b/app/Models/Resource.php
index fa7b9d71..7e1637ae 100644
--- a/app/Models/Resource.php
+++ b/app/Models/Resource.php
@@ -195,36 +195,4 @@ public function instance(
             where('resource_type_id', '=', $resource_type_id)->
             find($resource_id);
     }
-
-    /**
-     * Validate that the resource exists and is accessible to the user for
-     * viewing, editing etc. based on their permitted resource types
-     *
-     * @param integer $resource_id
-     * @param integer $resource_type_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_id,
-        int $resource_type_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource.resource_type_id', '=', $resource_type_id)->
-            where('resource.id', '=', $resource_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/ResourceType.php b/app/Models/ResourceType.php
index d4603584..b9073507 100644
--- a/app/Models/ResourceType.php
+++ b/app/Models/ResourceType.php
@@ -11,9 +11,6 @@
 /**
  * Resource type model
  *
- * Single() exists in this model to be consistent with all the other models, it is
- * simply a synonym for find()
- *
  * @mixin QueryBuilder
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
@@ -248,32 +245,4 @@ public function instance(int $resource_type_id): ?ResourceType
     {
         return $this->find($resource_type_id);
     }
-
-    /**
-     * Validate that the resource type exists and is accessible to the user for
-     * viewing, editing
-     *
-     * @param integer $id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->where('resource_type.id', '=', $id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/ResourceTypeAccess.php b/app/Models/ResourceTypeAccess.php
new file mode 100644
index 00000000..1fccef40
--- /dev/null
+++ b/app/Models/ResourceTypeAccess.php
@@ -0,0 +1,331 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models;
+
+use App\Utilities\Model as ModelUtility;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+/**
+ * Error log
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ResourceTypeAccess extends Model
+{
+    protected $table = 'permitted_user';
+
+    protected $guarded = ['id'];
+
+    /**
+     * Return an instance of a permitted user
+     *
+     * @param integer $resource_type_id
+     * @param integer $user_id
+     *
+     * @return ResourceTypeAccess|null
+     */
+    public function instance(int $resource_type_id, int $user_id): ?ResourceTypeAccess
+    {
+        return $this->where('resource_type_id', '=', $resource_type_id)->
+            where('user_id', '=', $user_id)->
+            first();
+    }
+
+    /**
+     * Validate that the category exists and is accessible to the user for
+     * viewing, editing based on their permitted resource types
+     *
+     * @param integer $resource_type_id
+     * @param integer $category_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function categoryExistsToUser(
+        int $resource_type_id,
+        int $category_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('category')->
+            where('category.id', '=', $category_id)->
+            join('resource_type', 'category.resource_type_id', 'resource_type.id')->
+            where('category.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the item exists and is accessible to the user for
+     * viewing, editing etc. based on their permitted resource types
+     *
+     * @param integer $resource_type_id
+     * @param integer $resource_id
+     * @param integer $item_id
+     * @param integer $item_category_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function itemCategoryExistsToUser(
+        int $resource_type_id,
+        int $resource_id,
+        int $item_id,
+        int $item_category_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('item_category')->
+            join('item', 'item_category.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            where('resource.id', '=', $resource_id)->
+            where('item.id', '=', $item_id)->
+            where('item_category.id', '=', $item_category_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the item exists and is accessible to the user for
+     * viewing, editing etc. based on their permitted resource types
+     *
+     * @param integer $resource_type_id
+     * @param integer $resource_id
+     * @param integer $item_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function itemExistsToUser(
+        int $resource_type_id,
+        int $resource_id,
+        int $item_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('item')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            where('resource.id', '=', $resource_id)->
+            where('item.id', '=', $item_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the item exists and is accessible to the user for
+     * viewing, editing etc. based on their permitted resource types
+     *
+     * @param integer $resource_type_id
+     * @param integer $resource_id
+     * @param integer $item_id
+     * @param integer $item_category_id
+     * @param integer $item_subcategory_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function itemSubcategoryExistsToUser(
+        int $resource_type_id,
+        int $resource_id,
+        int $item_id,
+        int $item_category_id,
+        int $item_subcategory_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('item_sub_category')->
+            join('item_category', 'item_sub_category.item_category_id', 'item_category.id')->
+            join('item', 'item_category.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            where('resource.id', '=', $resource_id)->
+            where('item.id', '=', $item_id)->
+            where('item_category.id', '=', $item_category_id)->
+            where('item_sub_category.id', '=', $item_subcategory_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the item type exists
+     *
+     * @param integer $id
+     *
+     * @return boolean
+     */
+    public function itemTypeExistsToUser(int $id): bool
+    {
+        $collection = $this->from('item_type')->
+            where('item_type.id', '=', $id);
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Fetch all the resource types the user has access to
+     *
+     * @param integer $user_id
+     *
+     * @return array
+     */
+    public function permittedResourceTypes(int $user_id): array
+    {
+        $permitted = [];
+
+        $results = $this->where('user_id', '=', $user_id)->
+            select('resource_type_id')->
+            get()->
+            toArray();
+
+        foreach ($results as $row) {
+            $permitted[] = $row['resource_type_id'];
+        }
+
+        return $permitted;
+    }
+
+    /**
+     * Validate that the resource exists and is accessible to the user for
+     * viewing, editing etc. based on their permitted resource types
+     *
+     * @param integer $resource_id
+     * @param integer $resource_type_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function resourceExistsToUser(
+        int $resource_id,
+        int $resource_type_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('resource')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            where('resource.id', '=', $resource_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the resource type exists and is accessible to the user for
+     * viewing, editing
+     *
+     * @param integer $id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function resourceTypeExistsToUser(
+        int $id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('resource_type')->
+            where('resource_type.id', '=', $id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+
+    /**
+     * Validate that the subcategory exists and is accessible to the user for
+     * viewing, editing based on their permitted resource types
+     *
+     * @param integer $resource_type_id
+     * @param integer $category_id
+     * @param integer $subcategory_id
+     * @param array $permitted_resource_types
+     * @param boolean $manage Should be exclude public items as we are checking
+     * a management route
+     *
+     * @return boolean
+     */
+    public function subcategoryExistsToUser(
+        int $resource_type_id,
+        int $category_id,
+        int $subcategory_id,
+        array $permitted_resource_types,
+        $manage = false
+    ): bool
+    {
+        $collection = $this->from('sub_category')->
+            where('sub_category.id', '=', $subcategory_id)->
+            join('category', 'sub_category.category_id', 'category.id')->
+            join('resource_type', 'category.resource_type_id', 'resource_type.id')->
+            where('sub_category.category_id', '=', $category_id)->
+            where('category.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            ($manage === true) ? false : true
+        );
+
+        return (count($collection->get()) === 1) ? true : false;
+    }
+}
diff --git a/app/Models/ResourceTypeItemType.php b/app/Models/ResourceTypeItemType.php
index 873ade7e..7f9c0c38 100644
--- a/app/Models/ResourceTypeItemType.php
+++ b/app/Models/ResourceTypeItemType.php
@@ -48,7 +48,7 @@ public function itemType(int $resource_type_id): ?string
      *
      * @param integer $resource_type_id
      *
-     * @return PermittedUser|null
+     * @return ResourceTypeAccess|null
      */
     public function instance(int $resource_type_id): ?ResourceTypeItemType
     {
diff --git a/app/Models/ResourceTypeItemType/AllocatedExpense.php b/app/Models/ResourceTypeItemType/AllocatedExpense.php
new file mode 100644
index 00000000..b2c26535
--- /dev/null
+++ b/app/Models/ResourceTypeItemType/AllocatedExpense.php
@@ -0,0 +1,315 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\ResourceTypeItemType;
+
+use App\Utilities\General;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Item model when fetching data by resource type
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class AllocatedExpense extends Model
+{
+    protected $table = 'item';
+
+    protected $guarded = ['id', 'actualised_total', 'created_at', 'updated_at'];
+
+    /**
+     * Return the total number of items for the requested resource type
+     *
+     * @param integer $resource_type_id
+     * @param array $parameters_collection
+     * @param array $search_conditions
+     *
+     * @return integer
+     */
+    public function totalCount(
+        int $resource_type_id,
+        array $parameters_collection = [],
+        array $search_conditions = []
+    ): int
+    {
+        $collection = $this->join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        if (array_key_exists('year', $parameters_collection) === true &&
+            $parameters_collection['year'] !== null) {
+            $collection->where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['year']);
+        }
+
+        if (array_key_exists('month', $parameters_collection) === true &&
+            $parameters_collection['month'] !== null) {
+            $collection->where(DB::raw('MONTH(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['month']);
+        }
+
+        if (array_key_exists('category', $parameters_collection) === true &&
+            $parameters_collection['category'] !== null) {
+            $collection->join("item_category", "item_category.item_id", "item.id");
+            $collection->where('item_category.category_id', '=', $parameters_collection['category']);
+
+            if (
+                array_key_exists('subcategory', $parameters_collection) === true &&
+                $parameters_collection['subcategory'] !== null
+            ) {
+                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
+                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id')->
+                    where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
+            }
+        }
+
+        if (count($search_conditions) > 0) {
+            foreach ($search_conditions as $field => $search_term) {
+                $collection->where('item_type_allocated_expense.' . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        if (
+            array_key_exists('include-unpublished', $parameters_collection) === false ||
+            $parameters_collection['include-unpublished'] === false
+        ) {
+            $collection->where(function ($collection) {
+                $collection->whereNull('item_type_allocated_expense.publish_after')->
+                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
+            });
+        }
+
+        return $collection->count();
+    }
+
+    /**
+     * Return the pagination collection for all the items assigned to the
+     * resources for a resource group
+     *
+     * @param int $resource_type_id
+     * @param int $offset
+     * @param int $limit
+     * @param array $parameters_collection
+     * @param array $sort_parameters
+     * @param array $search_conditions
+     *
+     * @return array
+     */
+    public function paginatedCollection(
+        int $resource_type_id,
+        int $offset = 0,
+        int $limit = 10,
+        array $parameters_collection = [],
+        array $sort_parameters = [],
+        array $search_conditions = []
+    ): array
+    {
+        $select_fields = [
+            'resource.id AS resource_id',
+            'resource.name AS resource_name',
+            'resource.description AS resource_description',
+            'item.id AS item_id',
+            'item_type_allocated_expense.name AS item_name',
+            'item_type_allocated_expense.description AS item_description',
+            'item_type_allocated_expense.effective_date AS item_effective_date',
+            'item_type_allocated_expense.total AS item_total',
+            'item_type_allocated_expense.percentage AS item_percentage',
+            'item_type_allocated_expense.actualised_total AS item_actualised_total',
+            'item.created_at AS item_created_at'
+        ];
+
+        $collection = $this->join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        $category_join = false; // Check to see if join has taken place
+        $subcategory_join = false; // Check to see if join has taken place
+
+        if (
+            array_key_exists('include-categories', $parameters_collection) === true &&
+            General::booleanValue($parameters_collection['include-categories']) === true
+        ) {
+            $collection->join('item_category', 'item.id', 'item_category.item_id')->
+                join('category', 'item_category.category_id', 'category.id');
+
+            $category_join = true;
+
+            $select_fields[] = 'category.id AS category_id';
+            $select_fields[] = 'category.name AS category_name';
+            $select_fields[] = 'category.description AS category_description';
+
+            if (array_key_exists('category', $parameters_collection) === true &&
+                $parameters_collection['category'] !== null) {
+                $collection->where('item_category.category_id', '=', $parameters_collection['category']);
+            }
+
+            if (
+                array_key_exists('include-subcategories', $parameters_collection) === true &&
+                General::booleanValue($parameters_collection['include-subcategories']) === true
+            ) {
+                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
+                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id');
+
+                $subcategory_join = true;
+
+                $select_fields[] = 'sub_category.id AS subcategory_id';
+                $select_fields[] = 'sub_category.name AS subcategory_name';
+                $select_fields[] = 'sub_category.description AS subcategory_description';
+
+                if (array_key_exists('subcategory', $parameters_collection) === true &&
+                    $parameters_collection['subcategory'] !== null) {
+                    $collection->where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
+                }
+            }
+        }
+
+        if (array_key_exists('year', $parameters_collection) === true &&
+            $parameters_collection['year'] !== null) {
+            $collection->where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['year']);
+        }
+
+        if (array_key_exists('month', $parameters_collection) === true &&
+            $parameters_collection['month'] !== null) {
+            $collection->where(DB::raw('MONTH(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['month']);
+        }
+
+        if (array_key_exists('category', $parameters_collection) === true &&
+            $parameters_collection['category'] !== null &&
+            $category_join === false) {
+
+            $collection->join('item_category', 'item.id', 'item_category.item_id')->
+                join('category', 'item_category.category_id', 'category.id')->
+                where('item_category.category_id', '=', $parameters_collection['category']);
+
+            if (array_key_exists('subcategory', $parameters_collection) === true &&
+                $parameters_collection['subcategory'] !== null &&
+                $subcategory_join === false) {
+
+                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
+                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id')->
+                    where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
+            }
+        }
+
+        if (count($search_conditions) > 0) {
+            foreach ($search_conditions as $field => $search_term) {
+                $collection->where('item_type_allocated_expense.' . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        if (
+            array_key_exists('include-unpublished', $parameters_collection) === false ||
+            $parameters_collection['include-unpublished'] === false
+        ) {
+            $collection->where(function ($collection) {
+                $collection->whereNull('item_type_allocated_expense.publish_after')->
+                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
+            });
+        }
+
+        if (count($sort_parameters) > 0) {
+            foreach ($sort_parameters as $field => $direction) {
+                switch ($field) {
+                    case 'created':
+                        $collection->orderBy('item.created_at', $direction);
+                        break;
+
+                    case 'actualised_total':
+                    case 'description':
+                    case 'effective_date':
+                    case 'name':
+                    case 'total':
+                        $collection->orderBy('item_type_allocated_expense.' . $field, $direction);
+                        break;
+
+                    default:
+                        $collection->orderBy('item.' . $field, $direction);
+                        break;
+                }
+            }
+        } else {
+            $collection->orderBy('item_type_allocated_expense.effective_date', 'desc');
+            $collection->orderBy('item.created_at', 'desc');
+        }
+
+        $collection->offset($offset);
+        $collection->limit($limit);
+        $collection->select($select_fields);
+
+        return $collection->get()->toArray();
+    }
+
+    /**
+     * Work out the maximum effective date year for the requested
+     * resource type id, defaults to the current year if no data exists
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function maximumEffectiveDateYear(int $resource_type_id): int
+    {
+        $result = $this->from('item_type_allocated_expense')->
+            join('item', 'item_type_allocated_expense.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            selectRaw('YEAR(MAX(`item_type_allocated_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
+    /**
+     * Work out the minimum effective date year for the requested
+     * resource type id, defaults to the current year if no data exists
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function minimumEffectiveDateYear(int $resource_type_id): int
+    {
+        $result = $this->from('item_type_allocated_expense')->
+            join('item', 'item_type_allocated_expense.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            selectRaw('YEAR(MIN(`item_type_allocated_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
+    /**
+     * Work out if we should be hiding unpublished items, by default we don't show them
+     *
+     * @param $collection
+     * @param boolean $include_unpublished
+     *
+     * @return Builder
+     */
+    private function includeUnpublished($collection, bool $include_unpublished): Builder
+    {
+        if ($include_unpublished === false) {
+            $collection->where(function ($sql) {
+                $sql->whereNull('item_type_allocated_expense.publish_after')->
+                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
+            });
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/Models/ResourceTypeItemTypeSimpleExpense.php b/app/Models/ResourceTypeItemType/SimpleExpense.php
similarity index 92%
rename from app/Models/ResourceTypeItemTypeSimpleExpense.php
rename to app/Models/ResourceTypeItemType/SimpleExpense.php
index 01241c5e..c47b768f 100644
--- a/app/Models/ResourceTypeItemTypeSimpleExpense.php
+++ b/app/Models/ResourceTypeItemType/SimpleExpense.php
@@ -1,10 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models;
+namespace App\Models\ResourceTypeItemType;
 
 use App\Utilities\General;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Facades\DB;
@@ -17,7 +16,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemTypeSimpleExpense extends Model
+class SimpleExpense extends Model
 {
     protected $table = 'item';
 
@@ -292,6 +291,54 @@ public function yearsSummary(int $resource_type_id): array
             toArray();
     }
 
+    /**
+     * Work out the maximum effective date year for the requested
+     * resource type id, defaults to the current year if no data exists
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function maximumEffectiveDateYear(int $resource_type_id): int
+    {
+        $result = $this->from('item_type_simple_expense')->
+            join('item', 'item_type_simple_expense.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            selectRaw('YEAR(MAX(`item_type_simple_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
+    /**
+     * Work out the minimum effective date year for the requested
+     * resource type id, defaults to the current year if no data exists
+     *
+     * @param integer $resource_type_id
+     *
+     * @return integer
+     */
+    public function minimumEffectiveDateYear(int $resource_type_id): int
+    {
+        $result = $this->from('item_type_simple_expense')->
+            join('item', 'item_type_simple_expense.item_id', 'item.id')->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource.resource_type_id', '=', $resource_type_id)->
+            selectRaw('YEAR(MAX(`item_type_simple_expense`.`effective_date`)) AS `year_limit`')->
+            first();
+
+        if ($result === null) {
+            return intval(date('Y'));
+        } else {
+            return intval($result->year_limit);
+        }
+    }
+
     /**
      * Return the summary for all items for the resources in the requested resource
      * type grouped by month for the requested year
diff --git a/app/Models/ResourceTypeItemType/Summary/AllocatedExpense.php b/app/Models/ResourceTypeItemType/Summary/AllocatedExpense.php
new file mode 100644
index 00000000..70f14bc4
--- /dev/null
+++ b/app/Models/ResourceTypeItemType/Summary/AllocatedExpense.php
@@ -0,0 +1,452 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\ResourceTypeItemType\Summary;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Item model when fetching data by resource type
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class AllocatedExpense extends Model
+{
+    protected $guarded = ['id', 'actualised_total', 'created_at', 'updated_at'];
+    protected $table = 'item';
+    protected $sub_table = 'item_type_allocated_expense';
+
+    /**
+     * Return the summary for all items for the resources in the requested resource type
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function summary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("sum({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by resource
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function resourcesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                resource.id AS id, 
+                resource.name AS `name`, 
+                SUM({$this->sub_table}.actualised_total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy('resource.id')->
+            orderBy('name')->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by year
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+
+     * @return array
+     */
+    public function yearsSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                YEAR({$this->sub_table}.effective_date) as year,
+                SUM({$this->sub_table}.actualised_total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by month for the requested year
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthsSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                MONTH({$this->sub_table}.effective_date) as month, 
+                SUM({$this->sub_table}.actualised_total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for a specific year and month
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param integer $month
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthSummary(
+        int $resource_type_id,
+        int $year,
+        int $month,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                MONTH({$this->sub_table}.effective_date) as month, 
+                SUM({$this->sub_table}.actualised_total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year)->
+            where(DB::raw("MONTH({$this->sub_table}.effective_date)"), '=', $month);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for a specific year
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                YEAR({$this->sub_table}.effective_date) as year, 
+                SUM({$this->sub_table}.actualised_total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by category
+     *
+     * @param integer $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categoriesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description,
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for the requested category
+     *
+     * @param integer $resource_type_id
+     * @param integer $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categorySummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description, 
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", '=', $category_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * @param int $resource_type_id
+     * @param int|null $category_id
+     * @param int|null $subcategory_id
+     * @param int|null $year
+     * @param int|null $month
+     * @param array $parameters
+     * @param array $search_parameters
+     * @return array
+     */
+    public function filteredSummary(
+        int $resource_type_id,
+        int $category_id = null,
+        int $subcategory_id = null,
+        int $year = null,
+        int $month = null,
+        array $parameters = [],
+        array $search_parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id);
+
+        if ($category_id !== null) {
+            $collection->where("category.id", "=", $category_id);
+        }
+        if ($subcategory_id !== null) {
+            $collection->where("sub_category.id", "=", $subcategory_id);
+        }
+        if ($year !== null) {
+            $collection->whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = {$year}"));
+        }
+        if ($month !== null) {
+            $collection->whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = {$month}"));
+        }
+        if (count($search_parameters) > 0) {
+            foreach ($search_parameters as $field => $search_term) {
+                $collection->where("{$this->sub_table}." . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type and category grouped by subcategory
+     *
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategoriesSummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description, 
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", "=", $category_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("sub_category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type and category and subcategory
+     *
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategorySummary(
+        int $resource_type_id,
+        int $category_id,
+        int $subcategory_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description, 
+                SUM($this->sub_table.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", "=", $category_id)->
+            where('sub_category.id', '=', $subcategory_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("sub_category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Work out if we should be hiding unpublished items, by default we don't show them
+     *
+     * @param $collection
+     * @param array $parameters
+     *
+     * @return Builder
+     */
+    private function includeUnpublished($collection, array $parameters): Builder
+    {
+        if (
+            array_key_exists('include-unpublished', $parameters) === false ||
+            $parameters['include-unpublished'] === false
+        ) {
+            $collection->where(function ($sql) {
+                $sql->whereNull('item_type_allocated_expense.publish_after')->
+                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
+            });
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/Models/ResourceTypeItemType/Summary/SimpleExpense.php b/app/Models/ResourceTypeItemType/Summary/SimpleExpense.php
new file mode 100644
index 00000000..903181e1
--- /dev/null
+++ b/app/Models/ResourceTypeItemType/Summary/SimpleExpense.php
@@ -0,0 +1,406 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\ResourceTypeItemType\Summary;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Item model when fetching data by resource type
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class SimpleExpense extends Model
+{
+    protected $guarded = ['id', 'created_at', 'updated_at'];
+    protected $table = 'item';
+    protected $sub_table = 'item_type_simple_expense';
+
+    /**
+     * Return the summary for all items for the resources in the requested resource type
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function summary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("sum({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        return $collection->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by resource
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function resourcesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                resource.id AS id, 
+                resource.name AS `name`, 
+                SUM({$this->sub_table}.total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        return $collection->groupBy('resource.id')->
+            orderBy('name')->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by year
+     *
+     * @param int $resource_type_id
+     * @param array $parameters
+
+     * @return array
+     */
+    public function yearsSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                YEAR({$this->sub_table}.effective_date) as year,
+                SUM({$this->sub_table}.total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by month for the requested year
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthsSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                MONTH({$this->sub_table}.effective_date) as month, 
+                SUM({$this->sub_table}.total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for a specific year and month
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param integer $month
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthSummary(
+        int $resource_type_id,
+        int $year,
+        int $month,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                MONTH({$this->sub_table}.effective_date) as month, 
+                SUM({$this->sub_table}.total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year)->
+            where(DB::raw("MONTH({$this->sub_table}.effective_date)"), '=', $month);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for a specific year
+     *
+     * @param integer $resource_type_id
+     * @param integer $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearSummary(
+        int $resource_type_id,
+        int $year,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                YEAR({$this->sub_table}.effective_date) as year, 
+                SUM({$this->sub_table}.total) AS total"
+            )->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where(DB::raw("YEAR({$this->sub_table}.effective_date)"), '=', $year);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type grouped by category
+     *
+     * @param integer $resource_type_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categoriesSummary(
+        int $resource_type_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description,
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id);
+
+        return $collection->groupBy("category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type for the requested category
+     *
+     * @param integer $resource_type_id
+     * @param integer $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categorySummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description, 
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", '=', $category_id);
+
+        return $collection->groupBy("category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * @param int $resource_type_id
+     * @param int|null $category_id
+     * @param int|null $subcategory_id
+     * @param int|null $year
+     * @param int|null $month
+     * @param array $parameters
+     * @param array $search_parameters
+     * @return array
+     */
+    public function filteredSummary(
+        int $resource_type_id,
+        int $category_id = null,
+        int $subcategory_id = null,
+        int $year = null,
+        int $month = null,
+        array $parameters = [],
+        array $search_parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id);
+
+        if ($category_id !== null) {
+            $collection->where("category.id", "=", $category_id);
+        }
+        if ($subcategory_id !== null) {
+            $collection->where("sub_category.id", "=", $subcategory_id);
+        }
+        if ($year !== null) {
+            $collection->whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = {$year}"));
+        }
+        if ($month !== null) {
+            $collection->whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = {$month}"));
+        }
+        if (count($search_parameters) > 0) {
+            foreach ($search_parameters as $field => $search_term) {
+                $collection->where("{$this->sub_table}." . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        return $collection->get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type and category grouped by subcategory
+     *
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategoriesSummary(
+        int $resource_type_id,
+        int $category_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description, 
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", "=", $category_id);
+
+        return $collection->groupBy("sub_category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for all items for the resources in the requested resource
+     * type and category and subcategory
+     *
+     * @param int $resource_type_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategorySummary(
+        int $resource_type_id,
+        int $category_id,
+        int $subcategory_id,
+        array $parameters
+    ): array
+    {
+        $collection = $this->selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description, 
+                SUM($this->sub_table.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("category.id", "=", $category_id)->
+            where('sub_category.id', '=', $subcategory_id);
+
+        return $collection->groupBy("sub_category.id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+}
diff --git a/app/Models/ResourceTypeItemTypeAllocatedExpense.php b/app/Models/ResourceTypeItemTypeAllocatedExpense.php
deleted file mode 100644
index 007d8754..00000000
--- a/app/Models/ResourceTypeItemTypeAllocatedExpense.php
+++ /dev/null
@@ -1,645 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Models;
-
-use App\Utilities\General;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Query\Builder as QueryBuilder;
-use Illuminate\Support\Facades\DB;
-
-/**
- * Item model when fetching data by resource type
- *
- * @mixin QueryBuilder
- * @author Dean Blackborough <dean@g3d-development.com>
- * @copyright G3D Development Limited 2018-2019
- * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
- */
-class ResourceTypeItemTypeAllocatedExpense extends Model
-{
-    protected $table = 'item';
-
-    protected $guarded = ['id', 'actualised_total', 'created_at', 'updated_at'];
-
-    /**
-     * Return the total number of items for the requested resource type
-     *
-     * @param integer $resource_type_id
-     * @param array $parameters_collection
-     * @param array $search_conditions
-     *
-     * @return integer
-     */
-    public function totalCount(
-        int $resource_type_id,
-        array $parameters_collection = [],
-        array $search_conditions = []
-    ): int
-    {
-        $collection = $this->join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource_type.id', '=', $resource_type_id);
-
-        if (array_key_exists('year', $parameters_collection) === true &&
-            $parameters_collection['year'] !== null) {
-            $collection->where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['year']);
-        }
-
-        if (array_key_exists('month', $parameters_collection) === true &&
-            $parameters_collection['month'] !== null) {
-            $collection->where(DB::raw('MONTH(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['month']);
-        }
-
-        if (array_key_exists('category', $parameters_collection) === true &&
-            $parameters_collection['category'] !== null) {
-            $collection->join("item_category", "item_category.item_id", "item.id");
-            $collection->where('item_category.category_id', '=', $parameters_collection['category']);
-
-            if (
-                array_key_exists('subcategory', $parameters_collection) === true &&
-                $parameters_collection['subcategory'] !== null
-            ) {
-                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
-                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id')->
-                    where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
-            }
-        }
-
-        if (count($search_conditions) > 0) {
-            foreach ($search_conditions as $field => $search_term) {
-                $collection->where('item_type_allocated_expense.' . $field, 'LIKE', '%' . $search_term . '%');
-            }
-        }
-
-        if (
-            array_key_exists('include-unpublished', $parameters_collection) === false ||
-            $parameters_collection['include-unpublished'] === false
-        ) {
-            $collection->where(function ($collection) {
-                $collection->whereNull('item_type_allocated_expense.publish_after')->
-                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
-            });
-        }
-
-        return $collection->count();
-    }
-
-    /**
-     * Return the pagination collection for all the items assigned to the
-     * resources for a resource group
-     *
-     * @param int $resource_type_id
-     * @param int $offset
-     * @param int $limit
-     * @param array $parameters_collection
-     * @param array $sort_parameters
-     * @param array $search_conditions
-     *
-     * @return array
-     */
-    public function paginatedCollection(
-        int $resource_type_id,
-        int $offset = 0,
-        int $limit = 10,
-        array $parameters_collection = [],
-        array $sort_parameters = [],
-        array $search_conditions = []
-    ): array
-    {
-        $select_fields = [
-            'resource.id AS resource_id',
-            'resource.name AS resource_name',
-            'resource.description AS resource_description',
-            'item.id AS item_id',
-            'item_type_allocated_expense.name AS item_name',
-            'item_type_allocated_expense.description AS item_description',
-            'item_type_allocated_expense.effective_date AS item_effective_date',
-            'item_type_allocated_expense.total AS item_total',
-            'item_type_allocated_expense.percentage AS item_percentage',
-            'item_type_allocated_expense.actualised_total AS item_actualised_total',
-            'item.created_at AS item_created_at'
-        ];
-
-        $collection = $this->join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource_type.id', '=', $resource_type_id);
-
-        $category_join = false; // Check to see if join has taken place
-        $subcategory_join = false; // Check to see if join has taken place
-
-        if (
-            array_key_exists('include-categories', $parameters_collection) === true &&
-            General::booleanValue($parameters_collection['include-categories']) === true
-        ) {
-            $collection->join('item_category', 'item.id', 'item_category.item_id')->
-                join('category', 'item_category.category_id', 'category.id');
-
-            $category_join = true;
-
-            $select_fields[] = 'category.id AS category_id';
-            $select_fields[] = 'category.name AS category_name';
-            $select_fields[] = 'category.description AS category_description';
-
-            if (array_key_exists('category', $parameters_collection) === true &&
-                $parameters_collection['category'] !== null) {
-                $collection->where('item_category.category_id', '=', $parameters_collection['category']);
-            }
-
-            if (
-                array_key_exists('include-subcategories', $parameters_collection) === true &&
-                General::booleanValue($parameters_collection['include-subcategories']) === true
-            ) {
-                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
-                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id');
-
-                $subcategory_join = true;
-
-                $select_fields[] = 'sub_category.id AS subcategory_id';
-                $select_fields[] = 'sub_category.name AS subcategory_name';
-                $select_fields[] = 'sub_category.description AS subcategory_description';
-
-                if (array_key_exists('subcategory', $parameters_collection) === true &&
-                    $parameters_collection['subcategory'] !== null) {
-                    $collection->where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
-                }
-            }
-        }
-
-        if (array_key_exists('year', $parameters_collection) === true &&
-            $parameters_collection['year'] !== null) {
-            $collection->where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['year']);
-        }
-
-        if (array_key_exists('month', $parameters_collection) === true &&
-            $parameters_collection['month'] !== null) {
-            $collection->where(DB::raw('MONTH(item_type_allocated_expense.effective_date)'), '=', $parameters_collection['month']);
-        }
-
-        if (array_key_exists('category', $parameters_collection) === true &&
-            $parameters_collection['category'] !== null &&
-            $category_join === false) {
-
-            $collection->join('item_category', 'item.id', 'item_category.item_id')->
-                join('category', 'item_category.category_id', 'category.id')->
-                where('item_category.category_id', '=', $parameters_collection['category']);
-
-            if (array_key_exists('subcategory', $parameters_collection) === true &&
-                $parameters_collection['subcategory'] !== null &&
-                $subcategory_join === false) {
-
-                $collection->join('item_sub_category', 'item_category.id', 'item_sub_category.item_category_id')->
-                    join('sub_category', 'item_sub_category.sub_category_id', 'sub_category.id')->
-                    where('item_sub_category.sub_category_id', '=', $parameters_collection['subcategory']);
-            }
-        }
-
-        if (count($search_conditions) > 0) {
-            foreach ($search_conditions as $field => $search_term) {
-                $collection->where('item_type_allocated_expense.' . $field, 'LIKE', '%' . $search_term . '%');
-            }
-        }
-
-        if (
-            array_key_exists('include-unpublished', $parameters_collection) === false ||
-            $parameters_collection['include-unpublished'] === false
-        ) {
-            $collection->where(function ($collection) {
-                $collection->whereNull('item_type_allocated_expense.publish_after')->
-                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
-            });
-        }
-
-        if (count($sort_parameters) > 0) {
-            foreach ($sort_parameters as $field => $direction) {
-                switch ($field) {
-                    case 'created':
-                        $collection->orderBy('item.created_at', $direction);
-                        break;
-
-                    case 'actualised_total':
-                    case 'description':
-                    case 'effective_date':
-                    case 'name':
-                    case 'total':
-                        $collection->orderBy('item_type_allocated_expense.' . $field, $direction);
-                        break;
-
-                    default:
-                        $collection->orderBy('item.' . $field, $direction);
-                        break;
-                }
-            }
-        } else {
-            $collection->orderBy('item_type_allocated_expense.effective_date', 'desc');
-            $collection->orderBy('item.created_at', 'desc');
-        }
-
-        $collection->offset($offset);
-        $collection->limit($limit);
-        $collection->select($select_fields);
-
-        return $collection->get()->toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource type
-     *
-     * @param int $resource_type_id
-     * @param boolean $include_unpublished = false
-     *
-     * @return array
-     */
-    public function summary(int $resource_type_id, bool $include_unpublished): array
-    {
-        $collection = $this->selectRaw('sum(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource_type.id', '=', $resource_type_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type grouped by resource
-     *
-     * @param int $resource_type_id
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function resourcesSummary(int $resource_type_id, bool $include_unpublished): array
-    {
-        $collection = $this->selectRaw('
-                resource.id AS id, 
-                resource.name AS `name`, 
-                SUM(item_type_allocated_expense.actualised_total) AS total'
-            )->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join('resource', 'item.resource_id', 'resource.id')->
-            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
-            where('resource_type.id', '=', $resource_type_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy('resource.id')->
-            orderBy('name')->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type grouped by year
-     *
-     * @param int $resource_type_id
-     * @param boolean $include_unpublished
-
-     * @return array
-     */
-    public function yearsSummary(int $resource_type_id, bool $include_unpublished): array
-    {
-        $collection = $this->selectRaw("
-                YEAR(item_type_allocated_expense.effective_date) as year,
-                SUM(item_type_allocated_expense.actualised_total) AS total"
-            )->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            where("resource_type.id", "=", $resource_type_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("year")->
-            orderBy("year")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type grouped by month for the requested year
-     *
-     * @param integer $resource_type_id
-     * @param integer $year
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function monthsSummary(int $resource_type_id, int $year, bool $include_unpublished): array
-    {
-        $collection = $this->selectRaw("
-                MONTH(item_type_allocated_expense.effective_date) as month, 
-                SUM(item_type_allocated_expense.actualised_total) AS total"
-            )->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            where("resource_type.id", "=", $resource_type_id)->
-            where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $year);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("month")->
-            orderBy("month")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type for a specific year and month
-     *
-     * @param integer $resource_type_id
-     * @param integer $year
-     * @param integer $month
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function monthSummary(
-        int $resource_type_id,
-        int $year,
-        int $month,
-        bool $include_unpublished
-    ): array
-    {
-        $collection = $this->selectRaw("
-                MONTH(item_type_allocated_expense.effective_date) as month, 
-                SUM(item_type_allocated_expense.actualised_total) AS total"
-            )->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            where("resource_type.id", "=", $resource_type_id)->
-            where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $year)->
-            where(DB::raw('MONTH(item_type_allocated_expense.effective_date)'), '=', $month);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("month")->
-            orderBy("month")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type for a specific year
-     *
-     * @param integer $resource_type_id
-     * @param integer $year
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function yearSummary(int $resource_type_id, int $year, bool $include_unpublished): array
-    {
-        $collection = $this->selectRaw("
-                YEAR(item_type_allocated_expense.effective_date) as year, 
-                SUM(item_type_allocated_expense.actualised_total) AS total"
-            )->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            where("resource_type.id", "=", $resource_type_id)->
-            where(DB::raw('YEAR(item_type_allocated_expense.effective_date)'), '=', $year);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("year")->
-            orderBy("year")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type grouped by category
-     *
-     * @param integer $resource_type_id
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function categoriesSummary(
-        int $resource_type_id,
-        bool $include_unpublished = false
-    ): array
-    {
-        $collection = $this->selectRaw('
-                category.id, 
-                category.name AS name, 
-                category.description AS description,
-                SUM(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            join("item_category", "item_category.item_id", "item.id")->
-            join("category", "category.id", "item_category.category_id")->
-            where("category.resource_type_id", "=", $resource_type_id)->
-            where("resource_type.id", "=", $resource_type_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("category.id")->
-            orderBy("name")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type for the requested category
-     *
-     * @param integer $resource_type_id
-     * @param integer $category_id
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function categorySummary(
-        int $resource_type_id,
-        int $category_id,
-        bool $include_unpublished = false
-    ): array
-    {
-        $collection = $this->selectRaw('
-                category.id, 
-                category.name AS name, 
-                category.description, 
-                SUM(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            join("item_category", "item_category.item_id", "item.id")->
-            join("category", "category.id", "item_category.category_id")->
-            where("category.resource_type_id", "=", $resource_type_id)->
-            where("resource_type.id", "=", $resource_type_id)->
-            where("category.id", '=', $category_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("category.id")->
-            orderBy("name")->
-            get()->
-            toArray();
-    }
-
-    public function filteredSummary(
-        int $resource_type_id,
-        int $category_id = null,
-        int $subcategory_id = null,
-        int $year = null,
-        int $month = null,
-        array $search_parameters = [],
-        bool $include_unpublished = false
-    ): array
-    {
-        $collection = $this->
-            selectRaw('SUM(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            join("item_category", "item_category.item_id", "item.id")->
-            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
-            join("category", "category.id", "item_category.category_id")->
-            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
-            where("resource_type.id", "=", $resource_type_id);
-
-        if ($category_id !== null) {
-            $collection->where("category.id", "=", $category_id);
-        }
-        if ($subcategory_id !== null) {
-            $collection->where("sub_category.id", "=", $subcategory_id);
-        }
-        if ($year !== null) {
-            $collection->whereRaw(DB::raw("YEAR(item_type_allocated_expense.effective_date) = {$year}"));
-        }
-        if ($month !== null) {
-            $collection->whereRaw(DB::raw("MONTH(item_type_allocated_expense.effective_date) = {$month}"));
-        }
-        if (count($search_parameters) > 0) {
-            foreach ($search_parameters as $field => $search_term) {
-                $collection->where('item_type_allocated_expense.' . $field, 'LIKE', '%' . $search_term . '%');
-            }
-        }
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type and category grouped by subcategory
-     *
-     * @param int $resource_type_id
-     * @param int $category_id
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function subcategoriesSummary(
-        int $resource_type_id,
-        int $category_id,
-        bool $include_unpublished = false
-    ): array
-    {
-        $collection = $this->selectRaw('
-                sub_category.id, 
-                sub_category.name AS name, 
-                sub_category.description AS description, 
-                SUM(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            join("item_category", "item_category.item_id", "item.id")->
-            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
-            join("category", "category.id", "item_category.category_id")->
-            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
-            where("category.resource_type_id", "=", $resource_type_id)->
-            where("resource_type.id", "=", $resource_type_id)->
-            where("category.id", "=", $category_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("sub_category.id")->
-            orderBy("name")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Return the summary for all items for the resources in the requested resource
-     * type and category and subcategory
-     *
-     * @param int $resource_type_id
-     * @param int $category_id
-     * @param int $subcategory_id
-     * @param boolean $include_unpublished
-     *
-     * @return array
-     */
-    public function subcategorySummary(
-        int $resource_type_id,
-        int $category_id,
-        int $subcategory_id,
-        bool $include_unpublished = false
-    ): array
-    {
-        $collection = $this->selectRaw('
-                sub_category.id, 
-                sub_category.name AS name, 
-                sub_category.description AS description, 
-                SUM(item_type_allocated_expense.actualised_total) AS total')->
-            join('item_type_allocated_expense', 'item.id', 'item_type_allocated_expense.item_id')->
-            join("resource", "resource.id", "item.resource_id")->
-            join("resource_type", "resource_type.id", "resource.resource_type_id")->
-            join("item_category", "item_category.item_id", "item.id")->
-            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
-            join("category", "category.id", "item_category.category_id")->
-            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
-            where("category.resource_type_id", "=", $resource_type_id)->
-            where("resource_type.id", "=", $resource_type_id)->
-            where("category.id", "=", $category_id)->
-            where('sub_category.id', '=', $subcategory_id);
-
-        $collection = $this->includeUnpublished($collection, $include_unpublished);
-
-        return $collection->groupBy("sub_category.id")->
-            orderBy("name")->
-            get()->
-            toArray();
-    }
-
-    /**
-     * Work out if we should be hiding unpublished items, by default we don't show them
-     *
-     * @param $collection
-     * @param boolean $include_unpublished
-     *
-     * @return Builder
-     */
-    private function includeUnpublished($collection, bool $include_unpublished): Builder
-    {
-        if ($include_unpublished === false) {
-            $collection->where(function ($sql) {
-                $sql->whereNull('item_type_allocated_expense.publish_after')->
-                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
-            });
-        }
-
-        return $collection;
-    }
-}
diff --git a/app/Models/SubCategory.php b/app/Models/Subcategory.php
similarity index 76%
rename from app/Models/SubCategory.php
rename to app/Models/Subcategory.php
index 5fc299fb..574fbd53 100644
--- a/app/Models/SubCategory.php
+++ b/app/Models/Subcategory.php
@@ -16,7 +16,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SubCategory extends Model
+class Subcategory extends Model
 {
     protected $table = 'sub_category';
 
@@ -137,7 +137,7 @@ public function single(
     public function instance(
         int $category_id,
         int $subcategory_id
-    ): ?SubCategory
+    ): ?Subcategory
     {
         return $this->select(
                 'sub_category.id',
@@ -151,11 +151,11 @@ public function instance(
     /**
      * Convert the model instance to an array for use with the transformer
      *
-     * @param SubCategory $subcategory
+     * @param Subcategory $subcategory
      *
      * @return array
      */
-    public function instanceToArray(SubCategory $subcategory): array
+    public function instanceToArray(Subcategory $subcategory): array
     {
         return [
             'subcategory_id' => $subcategory->id,
@@ -164,40 +164,4 @@ public function instanceToArray(SubCategory $subcategory): array
             'subcategory_created_at' => $subcategory->created_at->toDateTimeString()
         ];
     }
-
-    /**
-     * Validate that the subcategory exists and is accessible to the user for
-     * viewing, editing based on their permitted resource types
-     *
-     * @param integer $resource_type_id
-     * @param integer $category_id
-     * @param integer $subcategory_id
-     * @param array $permitted_resource_types
-     * @param boolean $manage Should be exclude public items as we are checking
-     * a management route
-     *
-     * @return boolean
-     */
-    public function existsToUser(
-        int $resource_type_id,
-        int $category_id,
-        int $subcategory_id,
-        array $permitted_resource_types,
-        $manage = false
-    ): bool
-    {
-        $collection = $this->where('sub_category.id', '=', $subcategory_id)->
-            join('category', 'sub_category.category_id', 'category.id')->
-            join('resource_type', 'category.resource_type_id', 'resource_type.id')->
-            where('sub_category.category_id', '=', $category_id)->
-            where('category.resource_type_id', '=', $resource_type_id);
-
-        $collection = ModelUtility::applyResourceTypeCollectionCondition(
-            $collection,
-            $permitted_resource_types,
-            ($manage === true) ? false : true
-        );
-
-        return (count($collection->get()) === 1) ? true : false;
-    }
 }
diff --git a/app/Models/Summary/Category.php b/app/Models/Summary/Category.php
new file mode 100644
index 00000000..d92151d5
--- /dev/null
+++ b/app/Models/Summary/Category.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary;
+
+use App\Utilities\Model as ModelUtility;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Category model
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class Category extends Model
+{
+    protected $table = 'category';
+
+    /**
+     * @param integer $resource_type_id
+     * @param array $permitted_resource_types
+     * @param boolean $include_public
+     * @param array $search_parameters
+     *
+     * @return integer
+     */
+    public function total(
+        int $resource_type_id,
+        array $permitted_resource_types,
+        bool $include_public,
+        array $search_parameters = []
+    ): int
+    {
+        $collection = $this->select('category.id')->
+            join("resource_type", "category.resource_type_id", "resource_type.id")->
+            where('category.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            $include_public
+        );
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        return $collection->count();
+    }
+}
diff --git a/app/Models/ItemSummary.php b/app/Models/Summary/Item.php
similarity index 99%
rename from app/Models/ItemSummary.php
rename to app/Models/Summary/Item.php
index 8488b34b..3f250084 100644
--- a/app/Models/ItemSummary.php
+++ b/app/Models/Summary/Item.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models;
+namespace App\Models\Summary;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -14,7 +14,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSummary extends Model
+class Item extends Model
 {
     protected $guarded = ['id', 'actualised_total', 'created_at', 'updated_at'];
     protected $table = 'item';
diff --git a/app/Models/Summary/ItemType/AllocatedExpense.php b/app/Models/Summary/ItemType/AllocatedExpense.php
new file mode 100644
index 00000000..2ebdf0e8
--- /dev/null
+++ b/app/Models/Summary/ItemType/AllocatedExpense.php
@@ -0,0 +1,434 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary\ItemType;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class AllocatedExpense extends Model
+{
+    protected $guarded = ['id', 'actualised_total', 'created_at', 'updated_at'];
+    protected $table = 'item';
+    protected $sub_table = 'item_type_allocated_expense';
+
+    /**
+     * Return the summary of items, grouped by category
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description,
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("item_category.category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for a specific category
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categorySummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description, 
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("item_category.category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a filter summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int|null $category_id
+     * @param int|null $subcategory_id
+     * @param int|null $year
+     * @param int|null $month
+     * @param array $parameters
+     * @param array $search_parameters
+     *
+     * @return array
+     */
+    public function filteredSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id = null,
+        int $subcategory_id = null,
+        int $year = null,
+        int $month = null,
+        array $parameters = [],
+        array $search_parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', 'item_type_allocated_expense.item_id')->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        if ($category_id !== null) {
+            $collection->where("category.id", "=", $category_id);
+        }
+        if ($subcategory_id !== null) {
+            $collection->where("sub_category.id", "=", $subcategory_id);
+        }
+        if ($year !== null) {
+            $collection->whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = {$year}"));
+        }
+        if ($month !== null) {
+            $collection->whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = {$month}"));
+        }
+        if (count($search_parameters) > 0) {
+            foreach ($search_parameters as $field => $search_term) {
+                $collection->where("{$this->sub_table}." . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->get()->
+            toArray();
+    }
+
+    /**
+     * Return a monthly summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("MONTH({$this->sub_table}.effective_date) as month, SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"));
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a summary for a specific month
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param int $month
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        int $month,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("MONTH({$this->sub_table}.effective_date) as month, SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"))->
+            whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = '{$month}'"));
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Subcategories summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description,
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("item_sub_category.sub_category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Subcategory summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategorySummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        int $subcategory_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description,
+                SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id)->
+            where("sub_category.id", "=", $subcategory_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("item_sub_category.sub_category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the total summary for all items
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function summary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->selectRaw("sum({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource_id', '=', $resource_id)->
+            where('resource.resource_type_id', '=', $resource_type_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->get()
+            ->toArray();
+    }
+
+    /**
+     * Return the summary grouped by years
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("YEAR({$this->sub_table}.effective_date) as year, SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a summary for a specific year
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("YEAR({$this->sub_table}.effective_date) as year, SUM({$this->sub_table}.actualised_total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"));
+
+        $collection = $this->includeUnpublished($collection, $parameters);
+
+        return $collection->groupBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Work out if we should be hiding unpublished items, by default we don't show them
+     *
+     * @param $collection
+     * @param array $parameters
+     *
+     * @return Builder
+     */
+    private function includeUnpublished($collection, array $parameters): Builder
+    {
+        if (
+            array_key_exists('include-unpublished', $parameters) === false ||
+            $parameters['include-unpublished'] === false
+        ) {
+            $collection->where(function ($sql) {
+                $sql->whereNull('item_type_allocated_expense.publish_after')->
+                    orWhereRaw('item_type_allocated_expense.publish_after < NOW()');
+            });
+        }
+
+        return $collection;
+    }
+}
diff --git a/app/Models/Summary/ItemType/SimpleExpense.php b/app/Models/Summary/ItemType/SimpleExpense.php
new file mode 100644
index 00000000..352f78c8
--- /dev/null
+++ b/app/Models/Summary/ItemType/SimpleExpense.php
@@ -0,0 +1,390 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary\ItemType;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class SimpleExpense extends Model
+{
+    protected $guarded = ['id', 'created_at', 'updated_at'];
+    protected $table = 'item';
+    protected $sub_table = 'item_type_simple_expense';
+
+    /**
+     * Return the summary of items, grouped by category
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description,
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        return $collection->groupBy("item_category.category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the summary for a specific category
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function categorySummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                category.id, 
+                category.name AS name, 
+                category.description AS description, 
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("category", "category.id", "item_category.category_id")->
+            where("category.resource_type_id", "=", $resource_type_id)->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id);
+
+        return $collection->groupBy("item_category.category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a filter summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int|null $category_id
+     * @param int|null $subcategory_id
+     * @param int|null $year
+     * @param int|null $month
+     * @param array $parameters
+     * @param array $search_parameters
+     *
+     * @return array
+     */
+    public function filteredSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id = null,
+        int $subcategory_id = null,
+        int $year = null,
+        int $month = null,
+        array $parameters = [],
+        array $search_parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        if ($category_id !== null) {
+            $collection->where("category.id", "=", $category_id);
+        }
+        if ($subcategory_id !== null) {
+            $collection->where("sub_category.id", "=", $subcategory_id);
+        }
+        if ($year !== null) {
+            $collection->whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = {$year}"));
+        }
+        if ($month !== null) {
+            $collection->whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = {$month}"));
+        }
+        if (count($search_parameters) > 0) {
+            foreach ($search_parameters as $field => $search_term) {
+                $collection->where("{$this->sub_table}." . $field, 'LIKE', '%' . $search_term . '%');
+            }
+        }
+
+        return $collection->get()->
+            toArray();
+    }
+
+    /**
+     * Return a monthly summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("MONTH({$this->sub_table}.effective_date) as month, SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"));
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a summary for a specific month
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param int $month
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function monthSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        int $month,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("MONTH({$this->sub_table}.effective_date) as month, SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"))->
+            whereRaw(DB::raw("MONTH({$this->sub_table}.effective_date) = '{$month}'"));
+
+        return $collection->groupBy("month")->
+            orderBy("month")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Subcategories summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategoriesSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description,
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id);
+
+        return $collection->groupBy("item_sub_category.sub_category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Subcategory summary
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $category_id
+     * @param int $subcategory_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function subcategorySummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $category_id,
+        int $subcategory_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("
+                sub_category.id, 
+                sub_category.name AS name, 
+                sub_category.description AS description,
+                SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            join("item_category", "item_category.item_id", "item.id")->
+            join("item_sub_category", "item_sub_category.item_category_id", "item_category.id")->
+            join("category", "category.id", "item_category.category_id")->
+            join("sub_category", "sub_category.id", "item_sub_category.sub_category_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            where("category.id", "=", $category_id)->
+            where("sub_category.id", "=", $subcategory_id);
+
+        return $collection->groupBy("item_sub_category.sub_category_id")->
+            orderBy("name")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return the total summary for all items
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function summary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->selectRaw("sum({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join('resource', 'item.resource_id', 'resource.id')->
+            where('resource_id', '=', $resource_id)->
+            where('resource.resource_type_id', '=', $resource_type_id);
+
+        return $collection->get()
+            ->toArray();
+    }
+
+    /**
+     * Return the summary grouped by years
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearsSummary(
+        int $resource_type_id,
+        int $resource_id,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("YEAR({$this->sub_table}.effective_date) as year, SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id);
+
+        return $collection->groupBy("year")->
+            orderBy("year")->
+            get()->
+            toArray();
+    }
+
+    /**
+     * Return a summary for a specific year
+     *
+     * @param int $resource_type_id
+     * @param int $resource_id
+     * @param int $year
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function yearSummary(
+        int $resource_type_id,
+        int $resource_id,
+        int $year,
+        array $parameters = []
+    ): array
+    {
+        $collection = $this->
+            selectRaw("YEAR({$this->sub_table}.effective_date) as year, SUM({$this->sub_table}.total) AS total")->
+            join($this->sub_table, 'item.id', "{$this->sub_table}.item_id")->
+            join("resource", "resource.id", "item.resource_id")->
+            join("resource_type", "resource_type.id", "resource.resource_type_id")->
+            where("resource_type.id", "=", $resource_type_id)->
+            where("resource.id", "=", $resource_id)->
+            whereRaw(DB::raw("YEAR({$this->sub_table}.effective_date) = '{$year}'"));
+
+        return $collection->groupBy("year")->
+            get()->
+            toArray();
+    }
+}
diff --git a/app/Models/Summary/RequestLog.php b/app/Models/Summary/RequestLog.php
new file mode 100644
index 00000000..1a16ffc5
--- /dev/null
+++ b/app/Models/Summary/RequestLog.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * Request log
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class RequestLog extends Model
+{
+    protected $table = 'request_log';
+
+    /**
+     * @param array $collection_parameters
+     *
+     * @return array
+     */
+    public function monthlyRequests(array $collection_parameters = []): array
+    {
+        $collection = $this->orderBy(DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"))
+            ->groupBy(DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"));
+
+        if (array_key_exists('source', $collection_parameters) === true) {
+            $collection->where("source", '=', $collection_parameters['source']);
+        }
+
+        $collection->select(
+            DB::raw("DATE_FORMAT(`request_log`.`created_at`, '%Y-%m')"),
+            DB::raw("COUNT(`request_log`.`id`) AS `requests`"),
+            DB::raw("ANY_VALUE(DATE_FORMAT(`request_log`.`created_at`, '%Y')) AS `year`"),
+            DB::raw("ANY_VALUE(DATE_FORMAT(`request_log`.`created_at`, '%M')) AS `month`")
+        );
+
+        return $collection->get()->toArray();
+    }
+}
diff --git a/app/Models/Summary/Resource.php b/app/Models/Summary/Resource.php
new file mode 100644
index 00000000..edcb9dc7
--- /dev/null
+++ b/app/Models/Summary/Resource.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary;
+
+use App\Utilities\Model as ModelUtility;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+/**
+ * Resource model
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class Resource extends Model
+{
+    protected $table = 'resource';
+
+    /**
+     * Return the total number of resources
+     *
+     * @param integer $resource_type_id
+     * @param array $permitted_resource_types
+     * @param boolean $include_public Include resources attached to public resource types
+     * @param array $search_parameters
+     *
+     * @return integer
+     */
+    public function totalCount(
+        int $resource_type_id,
+        array $permitted_resource_types,
+        bool $include_public,
+        array $search_parameters = []
+    ): int
+    {
+        $collection = $this->select("resource.id")->
+            join('resource_type', 'resource.resource_type_id', 'resource_type.id')->
+            where('resource_type.id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            $include_public
+        );
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        return $collection->count();
+    }
+}
diff --git a/app/Models/Summary/ResourceType.php b/app/Models/Summary/ResourceType.php
new file mode 100644
index 00000000..503eb29f
--- /dev/null
+++ b/app/Models/Summary/ResourceType.php
@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary;
+
+use App\Utilities\Model as ModelUtility;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+
+/**
+ * Resource type model
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ResourceType extends Model
+{
+    protected $table = 'resource_type';
+
+    /**
+     * Return the total number of resource types
+     *
+     * @param array $permitted_resource_types
+     * @param boolean $include_public
+     * @param array $search_parameters = []
+     *
+     * @return integer
+     */
+    public function totalCount(
+        array $permitted_resource_types = [],
+        bool $include_public = true,
+        array $search_parameters = []
+    ): int
+    {
+        $collection = $this->select("resource_type.id");
+
+        $collection = ModelUtility::applyResourceTypeCollectionCondition(
+            $collection,
+            $permitted_resource_types,
+            $include_public
+        );
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        return $collection->count();
+    }
+}
diff --git a/app/Models/Summary/Subcategory.php b/app/Models/Summary/Subcategory.php
new file mode 100644
index 00000000..f08689e7
--- /dev/null
+++ b/app/Models/Summary/Subcategory.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Summary;
+
+use App\Utilities\Model as ModelUtility;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Sub category model
+ *
+ * @mixin QueryBuilder
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class SubCategory extends Model
+{
+    protected $table = 'sub_category';
+
+    /**
+     * @param integer $resource_type_id
+     * @param integer $category_id
+     * @param array $search_parameters
+     *
+     * @return integer
+     */
+    public function totalCount(
+        int $resource_type_id,
+        int $category_id,
+        array $search_parameters = []
+    ): int
+    {
+        $collection = $this->join('category', 'sub_category.category_id', 'category.id')->
+            where('sub_category.category_id', '=', $category_id)->
+            where('category.resource_type_id', '=', $resource_type_id);
+
+        $collection = ModelUtility::applySearch($collection, $this->table, $search_parameters);
+
+        return $collection->count();
+    }
+}
diff --git a/app/Models/Transformers/Category.php b/app/Models/Transformers/Category.php
index 5c630fcf..a9d192f4 100644
--- a/app/Models/Transformers/Category.php
+++ b/app/Models/Transformers/Category.php
@@ -54,7 +54,7 @@ public function toArray(): array
         }
 
         foreach ($this->subcategories as $subcategory) {
-            $result['subcategories']['collection'][] = (new SubCategory($subcategory))->toArray();
+            $result['subcategories']['collection'][] = (new Subcategory($subcategory))->toArray();
         }
 
         return $result;
diff --git a/app/Models/Transformers/ItemSubCategory.php b/app/Models/Transformers/ItemSubcategory.php
similarity index 96%
rename from app/Models/Transformers/ItemSubCategory.php
rename to app/Models/Transformers/ItemSubcategory.php
index 11ed67eb..b976be8e 100644
--- a/app/Models/Transformers/ItemSubCategory.php
+++ b/app/Models/Transformers/ItemSubcategory.php
@@ -10,7 +10,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategory extends Transformer
+class ItemSubcategory extends Transformer
 {
     protected $data_to_transform;
 
diff --git a/app/Models/Transformers/ItemType.php b/app/Models/Transformers/ItemType.php
new file mode 100644
index 00000000..7ee52004
--- /dev/null
+++ b/app/Models/Transformers/ItemType.php
@@ -0,0 +1,41 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Transformers;
+
+/**
+ * Transform the data returned from Eloquent into the format we want for the API
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ItemType extends Transformer
+{
+    private $data_to_transform;
+
+    /**
+     * @param array $data_to_transform
+     */
+    public function __construct(array $data_to_transform)
+    {
+        parent::__construct();
+
+        $this->data_to_transform = $data_to_transform;
+    }
+
+    /**
+     * Format the data
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->hash->itemType()->encode($this->data_to_transform['item_type_id']),
+            'name' => $this->data_to_transform['item_type_name'],
+            'description' => $this->data_to_transform['item_type_description'],
+            'created' => $this->data_to_transform['item_type_created_at']
+        ];
+    }
+}
diff --git a/app/Models/Transformers/ItemTypeAllocatedExpense.php b/app/Models/Transformers/ItemType/AllocatedExpense.php
similarity index 94%
rename from app/Models/Transformers/ItemTypeAllocatedExpense.php
rename to app/Models/Transformers/ItemType/AllocatedExpense.php
index f307bfaa..2d890dd0 100644
--- a/app/Models/Transformers/ItemTypeAllocatedExpense.php
+++ b/app/Models/Transformers/ItemType/AllocatedExpense.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\ItemType;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeAllocatedExpense extends Transformer
+class AllocatedExpense extends Transformer
 {
     protected $item;
 
diff --git a/app/Models/Transformers/ItemTypeSimpleExpense.php b/app/Models/Transformers/ItemType/SimpleExpense.php
similarity index 93%
rename from app/Models/Transformers/ItemTypeSimpleExpense.php
rename to app/Models/Transformers/ItemType/SimpleExpense.php
index 64d80f57..e10811a2 100644
--- a/app/Models/Transformers/ItemTypeSimpleExpense.php
+++ b/app/Models/Transformers/ItemType/SimpleExpense.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\ItemType;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeSimpleExpense extends Transformer
+class SimpleExpense extends Transformer
 {
     protected $item;
 
diff --git a/app/Models/Transformers/PermittedUser.php b/app/Models/Transformers/PermittedUser.php
new file mode 100644
index 00000000..135b63d5
--- /dev/null
+++ b/app/Models/Transformers/PermittedUser.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Models\Transformers;
+
+/**
+ * Transform the data returned from Eloquent into the format we want for the API
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class PermittedUser extends Transformer
+{
+    private $data_to_transform;
+
+    public function __construct(array $data_to_transform)
+    {
+        parent::__construct();
+
+        $this->data_to_transform = $data_to_transform;
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->hash->permittedUser()->encode($this->data_to_transform['permitted_user_id']),
+            'name' => $this->data_to_transform['permitted_user_name'],
+            'email' => $this->data_to_transform['permitted_user_email'],
+            'created' => $this->data_to_transform['permitted_user_created_at']
+        ];
+    }
+}
diff --git a/app/Models/Transformers/ResourceTypeItemTypeAllocatedExpense.php b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
similarity index 94%
rename from app/Models/Transformers/ResourceTypeItemTypeAllocatedExpense.php
rename to app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
index 935bf445..d9636122 100644
--- a/app/Models/Transformers/ResourceTypeItemTypeAllocatedExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/AllocatedExpense.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\ResourceTypeItemType;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemTypeAllocatedExpense extends Transformer
+class AllocatedExpense extends Transformer
 {
     protected $item;
 
diff --git a/app/Models/Transformers/ResourceTypeItemTypeSimpleExpense.php b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
similarity index 94%
rename from app/Models/Transformers/ResourceTypeItemTypeSimpleExpense.php
rename to app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
index a3697ac9..b86d1825 100644
--- a/app/Models/Transformers/ResourceTypeItemTypeSimpleExpense.php
+++ b/app/Models/Transformers/ResourceTypeItemType/SimpleExpense.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\ResourceTypeItemType;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemTypeSimpleExpense extends Transformer
+class SimpleExpense extends Transformer
 {
     protected $item;
 
diff --git a/app/Models/Transformers/SubCategory.php b/app/Models/Transformers/Subcategory.php
similarity index 96%
rename from app/Models/Transformers/SubCategory.php
rename to app/Models/Transformers/Subcategory.php
index 535518b0..0a682270 100644
--- a/app/Models/Transformers/SubCategory.php
+++ b/app/Models/Transformers/Subcategory.php
@@ -10,7 +10,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SubCategory extends Transformer
+class Subcategory extends Transformer
 {
     protected $data_to_transform;
 
diff --git a/app/Models/Transformers/ItemCategorySummary.php b/app/Models/Transformers/Summary/ItemCategory.php
similarity index 81%
rename from app/Models/Transformers/ItemCategorySummary.php
rename to app/Models/Transformers/Summary/ItemCategory.php
index db439b03..30a4d77a 100644
--- a/app/Models/Transformers/ItemCategorySummary.php
+++ b/app/Models/Transformers/Summary/ItemCategory.php
@@ -1,19 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on an array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemCategorySummary extends Transformer
+class ItemCategory extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ItemMonthSummary.php b/app/Models/Transformers/Summary/ItemMonth.php
similarity index 88%
rename from app/Models/Transformers/ItemMonthSummary.php
rename to app/Models/Transformers/Summary/ItemMonth.php
index 0178e7e6..ce3dd641 100644
--- a/app/Models/Transformers/ItemMonthSummary.php
+++ b/app/Models/Transformers/Summary/ItemMonth.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemMonthSummary extends Transformer
+class ItemMonth extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ItemSubCategorySummary.php b/app/Models/Transformers/Summary/ItemSubcategory.php
similarity index 80%
rename from app/Models/Transformers/ItemSubCategorySummary.php
rename to app/Models/Transformers/Summary/ItemSubcategory.php
index a073f662..77d68302 100644
--- a/app/Models/Transformers/ItemSubCategorySummary.php
+++ b/app/Models/Transformers/Summary/ItemSubcategory.php
@@ -1,19 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on an array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategorySummary extends Transformer
+class ItemSubcategory extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ItemYearSummary.php b/app/Models/Transformers/Summary/ItemYear.php
similarity index 87%
rename from app/Models/Transformers/ItemYearSummary.php
rename to app/Models/Transformers/Summary/ItemYear.php
index f5f17468..99421657 100644
--- a/app/Models/Transformers/ItemYearSummary.php
+++ b/app/Models/Transformers/Summary/ItemYear.php
@@ -1,7 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data returns from Eloquent into the format we want for the API
@@ -10,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemYearSummary extends Transformer
+class ItemYear extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ResourceTypeItemCategorySummary.php b/app/Models/Transformers/Summary/ResourceTypeItemCategory.php
similarity index 80%
rename from app/Models/Transformers/ResourceTypeItemCategorySummary.php
rename to app/Models/Transformers/Summary/ResourceTypeItemCategory.php
index c09a411f..04d61584 100644
--- a/app/Models/Transformers/ResourceTypeItemCategorySummary.php
+++ b/app/Models/Transformers/Summary/ResourceTypeItemCategory.php
@@ -1,19 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemCategorySummary extends Transformer
+class ResourceTypeItemCategory extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ResourceTypeItemMonthSummary.php b/app/Models/Transformers/Summary/ResourceTypeItemMonth.php
similarity index 78%
rename from app/Models/Transformers/ResourceTypeItemMonthSummary.php
rename to app/Models/Transformers/Summary/ResourceTypeItemMonth.php
index 16829eb6..335824da 100644
--- a/app/Models/Transformers/ResourceTypeItemMonthSummary.php
+++ b/app/Models/Transformers/Summary/ResourceTypeItemMonth.php
@@ -2,19 +2,18 @@
 
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemMonthSummary extends Transformer
+class ResourceTypeItemMonth extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ResourceTypeItemResourceSummary.php b/app/Models/Transformers/Summary/ResourceTypeItemResource.php
similarity index 78%
rename from app/Models/Transformers/ResourceTypeItemResourceSummary.php
rename to app/Models/Transformers/Summary/ResourceTypeItemResource.php
index f8014945..40a4735a 100644
--- a/app/Models/Transformers/ResourceTypeItemResourceSummary.php
+++ b/app/Models/Transformers/Summary/ResourceTypeItemResource.php
@@ -1,19 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemResourceSummary extends Transformer
+class ResourceTypeItemResource extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ResourceTypeItemSubcategorySummary.php b/app/Models/Transformers/Summary/ResourceTypeItemSubcategory.php
similarity index 80%
rename from app/Models/Transformers/ResourceTypeItemSubcategorySummary.php
rename to app/Models/Transformers/Summary/ResourceTypeItemSubcategory.php
index baf2fa22..1a6a2b06 100644
--- a/app/Models/Transformers/ResourceTypeItemSubcategorySummary.php
+++ b/app/Models/Transformers/Summary/ResourceTypeItemSubcategory.php
@@ -1,19 +1,18 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemSubcategorySummary extends Transformer
+class ResourceTypeItemSubcategory extends Transformer
 {
     private $data_to_transform;
 
diff --git a/app/Models/Transformers/ResourceTypeItemYearSummary.php b/app/Models/Transformers/Summary/ResourceTypeItemYear.php
similarity index 77%
rename from app/Models/Transformers/ResourceTypeItemYearSummary.php
rename to app/Models/Transformers/Summary/ResourceTypeItemYear.php
index 5feae0f5..f363482a 100644
--- a/app/Models/Transformers/ResourceTypeItemYearSummary.php
+++ b/app/Models/Transformers/Summary/ResourceTypeItemYear.php
@@ -2,19 +2,18 @@
 
 declare(strict_types=1);
 
-namespace App\Models\Transformers;
+namespace App\Models\Transformers\Summary;
+
+use App\Models\Transformers\Transformer;
 
 /**
  * Transform the data array into the format we require for the API
  *
- * This is an updated version of the transformers, the other transformers need to
- * be updated to operate on array rather than collections
- *
  * @author Dean Blackborough <dean@g3d-development.com>
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ResourceTypeItemYearSummary extends Transformer
+class ResourceTypeItemYear extends Transformer
 {
     private $year_summary;
 
diff --git a/app/Option/Get.php b/app/Option/Get.php
index d6ac54d3..e2447530 100644
--- a/app/Option/Get.php
+++ b/app/Option/Get.php
@@ -97,7 +97,7 @@ static public function setPagination(
     ): Get
     {
         if ($status === true) {
-            self::$pagination_parameters = Config::get('api.pagination.parameters');
+            self::$pagination_parameters = Config::get('api.app.pagination-parameters');
         }
 
         return self::$instance;
@@ -108,22 +108,17 @@ static public function setPaginationOverride(
     ): Get
     {
         if ($status === true) {
-            self::$pagination_parameters = Config::get('api.pagination.parameters-including-collection');
+            self::$pagination_parameters = Config::get('api.app.pagination-parameters-including-collection');
         }
 
         return self::$instance;
     }
 
     static public function setParameters(
-        string $config_path,
-        bool $include_base_item_collection_parameters = false
+        string $config_path
     ): Get
     {
-        self::$parameters =
-            array_merge(
-                ($include_base_item_collection_parameters === true) ? Config::get('api.item.parameters.collection') : [],
-                Config::get($config_path)
-            );
+        self::$parameters = Config::get($config_path);
 
         return self::$instance;
     }
@@ -155,8 +150,8 @@ static protected function build()
         foreach (
             array_merge_recursive(
                 self::$pagination_parameters,
-                (self::$sortable === true ? Config::get('api.sortable.parameters') : []),
-                (self::$searchable === true ? Config::get('api.searchable.parameters') : []),
+                (self::$sortable === true ? Config::get('api.app.sortable-parameters') : []),
+                (self::$searchable === true ? Config::get('api.app.searchable-parameters') : []),
                 self::$parameters,
                 self::$conditional_parameters
             )
diff --git a/app/Utilities/Hash.php b/app/Utilities/Hash.php
index e97ae4a8..422d6bc4 100644
--- a/app/Utilities/Hash.php
+++ b/app/Utilities/Hash.php
@@ -19,7 +19,6 @@
  */
 class Hash
 {
-    private $min_length;
     private $hashers;
 
     public function __construct()
@@ -33,16 +32,19 @@ public function __construct()
 
     private function setUp()
     {
-        $this->min_length = Config::get('api.hashids.min_length');
-
-        $this->hashers['category'] = new Hashids(Config::get('api.hashids.category'), $this->min_length);
-        $this->hashers['subcategory'] = new Hashids(Config::get('api.hashids.subcategory'), $this->min_length);
-        $this->hashers['resource_type'] = new Hashids(Config::get('api.hashids.resource_type'), $this->min_length);
-        $this->hashers['resource'] = new Hashids(Config::get('api.hashids.resource'), $this->min_length);
-        $this->hashers['item'] = new Hashids(Config::get('api.hashids.item'), $this->min_length);
-        $this->hashers['item_category'] = new Hashids(Config::get('api.hashids.item_category'), $this->min_length);
-        $this->hashers['item_sub_category'] = new Hashids(Config::get('api.hashids.item_subcategory'), $this->min_length);
-        $this->hashers['item_type'] = new Hashids(Config::get('api.hashids.item_type'), $this->min_length);
+        $config = Config::get('api.app.hashids');
+
+        $min_length = $config['min_length'];
+
+        $this->hashers['category'] = new Hashids($config['category'], $min_length);
+        $this->hashers['subcategory'] = new Hashids($config['subcategory'], $min_length);
+        $this->hashers['resource_type'] = new Hashids($config['resource_type'], $min_length);
+        $this->hashers['resource'] = new Hashids($config['resource'], $min_length);
+        $this->hashers['item'] = new Hashids($config['item'], $min_length);
+        $this->hashers['item_category'] = new Hashids($config['item_category'], $min_length);
+        $this->hashers['item_sub_category'] = new Hashids($config['item_subcategory'], $min_length);
+        $this->hashers['item_type'] = new Hashids($config['item_type'], $min_length);
+        $this->hashers['permitted_user'] = new Hashids($config['permitted_user'], $min_length);
     }
 
     /**
@@ -159,4 +161,14 @@ public function itemType(): Hashids
     {
         return $this->hashers['item_type'];
     }
+
+    /**
+     * Helper method to return the permitted user
+     *
+     * @return Hashids
+     */
+    public function permittedUser(): Hashids
+    {
+        return $this->hashers['permitted_user'];
+    }
 }
diff --git a/app/Utilities/Response.php b/app/Utilities/Response.php
index 9bf2868d..0062fb0b 100644
--- a/app/Utilities/Response.php
+++ b/app/Utilities/Response.php
@@ -3,6 +3,8 @@
 
 namespace App\Utilities;
 
+use App;
+use Exception;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -20,20 +22,42 @@
  */
 class Response
 {
+
+    static protected function addException(array $response, ?Exception $e = null): array
+    {
+        if (App::environment() !== 'production' && $e !== null) {
+            $response['exception'] = [
+                'message' => $e->getMessage(),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+                'trace' => $e->getTraceAsString()
+            ];
+        }
+
+        return $response;
+    }
+
     /**
      * Return not found, 404
      *
      * @param string|null $type Entity type that cannot be found
+     * @param Exception|null $e
      *
      * @return JsonResponse
      */
-    static public function notFound(?string $type = null): JsonResponse
+    static public function notFound(?string $type = null, ?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => ($type !== null) ? trans('responses.not-found-entity', ['type'=>$type]) :
+                trans('responses.not-found')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => ($type !== null) ? trans('responses.not-found-entity', ['type'=>$type]) :
-                    trans('responses.not-found')
-            ],
+            $response,
             404
         )->send();
         exit;
@@ -43,16 +67,23 @@ static public function notFound(?string $type = null): JsonResponse
      * Return not found, 404
      *
      * @param string|null $type Entity type that cannot be found
+     * @param Exception|null $e
      *
      * @return JsonResponse
      */
-    static public function notFoundOrNotAccessible(?string $type = null): JsonResponse
+    static public function notFoundOrNotAccessible(?string $type = null, ?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => ($type !== null) ? trans('responses.not-found-or-not-accessible-entity', ['type'=>$type]) :
+                trans('responses.not-found')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => ($type !== null) ? trans('responses.not-found-or-not-accessible-entity', ['type'=>$type]) :
-                    trans('responses.not-found')
-            ],
+            $response,
             404
         )->send();
         exit;
@@ -62,15 +93,22 @@ static public function notFoundOrNotAccessible(?string $type = null): JsonRespon
      * Return a foreign key constraint error, 500
      *
      * @param string $message Custom message for error
+     * @param Exception|null $e
      *
      * @return JsonResponse
      */
-    static public function foreignKeyConstraintError($message = ''): JsonResponse
+    static public function foreignKeyConstraintError($message = '', ?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => (strlen($message) > 0) ? $message : trans('responses.constraint')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => (strlen($message) > 0) ? $message : trans('responses.constraint')
-            ],
+            $response,
             500
         )->send();
         exit;
@@ -82,14 +120,22 @@ static public function foreignKeyConstraintError($message = ''): JsonResponse
      * Until we add logging this is an unknown server error, later we will
      * add MySQL error logging
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function failedToSelectModelForUpdate(): JsonResponse
+    static public function failedToSelectModelForUpdate(?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.model-select-failure'),
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.model-select-failure'),
-            ],
+            $response,
             500
         )->send();
         exit();
@@ -101,33 +147,73 @@ static public function failedToSelectModelForUpdate(): JsonResponse
      * Until we add logging this is an unknown server error, later we will
      * add MySQL error logging
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function failedToSaveModelForUpdate(): JsonResponse
+    static public function failedToSaveModelForUpdate(?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.model-save-failure-update'),
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.model-save-failure-update'),
-            ],
+            $response,
             500
         )->send();
         exit();
     }
 
+    /**
+     * 403 error, authentication required
+     *
+     * @param Exception|null $e
+     *
+     * @return JsonResponse
+     */
+    static public function authenticationRequired(?Exception $e = null): JsonResponse
+    {
+        $response = [
+            'message' => trans('responses.authentication-required')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
+        response()->json(
+            $response,
+            403
+        )->send();
+        exit();
+    }
+
     /**
      * 500 error, failed to save the model.
      *
      * Until we add logging this is an unknown server error, later we will
      * add MySQL error logging
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function failedToSaveModelForCreate(): JsonResponse
+    static public function failedToSaveModelForCreate(?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.model-save-failure-create'),
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.model-save-failure-create'),
-            ],
+            $response,
             500
         )->send();
         exit();
@@ -137,14 +223,22 @@ static public function failedToSaveModelForCreate(): JsonResponse
      * 404 error, unable to decode the selected value, hasher missing or value
      * invalid
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function unableToDecode(): JsonResponse
+    static public function unableToDecode(?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.decode-error')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.decode-error')
-            ],
+            $response,
             500
         )->send();
         exit;
@@ -153,11 +247,19 @@ static public function unableToDecode(): JsonResponse
     /**
      * 204, successful request, no content to return, typically a PATCH
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function successNoContent(): JsonResponse
+    static public function successNoContent(?Exception $e = null): JsonResponse
     {
-        response()->json([],204)->send();
+        $response = [];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
+        response()->json($response,204)->send();
         exit;
     }
 
@@ -165,25 +267,41 @@ static public function successNoContent(): JsonResponse
      * 200, successful request, no content to return
      *
      * @param boolean $array Return empty array, if false empty object
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function successEmptyContent(bool $array = false): JsonResponse
+    static public function successEmptyContent(bool $array = false, ?Exception $e = null): JsonResponse
     {
-        response()->json(($array === true ? [] : null),200)->send();
+        $response = ($array === true ? [] : null);
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
+        response()->json($response,200)->send();
         exit;
     }
 
     /**
      * 400 error, nothing to PATCH, bad request
      *
+     * @param Exception|null $e
+     *
      * @return JsonResponse
      */
-    static public function nothingToPatch()
+    static public function nothingToPatch(?Exception $e = null)
     {
+        $response = [
+            'message' => trans('responses.patch-empty')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.patch-empty')
-            ],
+            $response,
             400
         )->send();
         exit();
@@ -193,35 +311,73 @@ static public function nothingToPatch()
      * 400 error, invalid fields in the request, therefore bad request
      *
      * @param array $invalid_fields An array of invalid fields
+     * @param Exception|null $e
      *
      * @return JsonResponse
      */
-    static public function invalidFieldsInRequest(array $invalid_fields): JsonResponse
+    static public function invalidFieldsInRequest(array $invalid_fields, ?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.patch-invalid'),
+            'fields' => $invalid_fields
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.patch-invalid'),
-                'fields' => $invalid_fields
-            ],
+            $response,
             400
         )->send();
         exit();
     }
 
+    /**
+     * 503, maintenance
+     *
+     * @param Exception|null $e
+     *
+     * @return JsonResponse
+     */
+    static public function maintenance(?Exception $e = null): JsonResponse
+    {
+        $response = [
+            'message' => trans('responses.maintenance')
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
+        response()->json(
+            $response,
+            503
+        )->send();
+        exit();
+    }
+
     /**
      * 422 error, validation error
      *
      * @param array $validation_errors
+     * @param Exception|null $e
      *
      * @return JsonResponse
      */
-    static public function validationErrors(array $validation_errors): JsonResponse
+    static public function validationErrors(array $validation_errors, ?Exception $e = null): JsonResponse
     {
+        $response = [
+            'message' => trans('responses.validation'),
+            'fields' => $validation_errors
+        ];
+
+        if ($e instanceOf Exception) {
+            $response = self::addException($response, $e);
+        }
+
         response()->json(
-            [
-                'message' => trans('responses.validation'),
-                'fields' => $validation_errors
-            ],
+            $response,
             422
         )->send();
         exit();
diff --git a/app/Utilities/RoutePermission.php b/app/Utilities/RoutePermission.php
index 50475e0a..a7fbf817 100644
--- a/app/Utilities/RoutePermission.php
+++ b/app/Utilities/RoutePermission.php
@@ -6,10 +6,10 @@
 use App\Validators\Request\Routes\Category;
 use App\Validators\Request\Routes\Item;
 use App\Validators\Request\Routes\ItemCategory;
-use App\Validators\Request\Routes\ItemSubCategory;
+use App\Validators\Request\Routes\ItemSubcategory;
 use App\Validators\Request\Routes\Resource;
 use App\Validators\Request\Routes\ResourceType;
-use App\Validators\Request\Routes\SubCategory;
+use App\Validators\Request\Routes\Subcategory;
 
 /**
  * Work out the permissions for each route, permissions are read and manage
@@ -70,13 +70,13 @@ static public function subcategory(
     ): array
     {
         return [
-            'view' => SubCategory::existsToUserForViewing(
+            'view' => Subcategory::existsToUserForViewing(
                 (int) $resource_type_id,
                 (int) $category_id,
                 (int) $subcategory_id,
                 $permitted_resource_types
             ),
-            'manage' => SubCategory::existsToUserForManagement(
+            'manage' => Subcategory::existsToUserForManagement(
                 (int) $resource_type_id,
                 (int) $category_id,
                 (int) $subcategory_id,
@@ -236,7 +236,7 @@ static public function itemSubcategory(
     ): array
     {
         return [
-        'view' => ItemSubCategory::existsToUserForViewing(
+        'view' => ItemSubcategory::existsToUserForViewing(
                 (int) $resource_type_id,
                 (int) $resource_id,
                 (int) $item_id,
@@ -244,7 +244,7 @@ static public function itemSubcategory(
                 (int) $item_subcategory_id,
                 $permitted_resource_types
             ),
-        'manage' => ItemSubCategory::existsToUserForManagement(
+        'manage' => ItemSubcategory::existsToUserForManagement(
                 (int) $resource_type_id,
                 (int) $resource_id,
                 (int) $item_id,
diff --git a/app/Validators/Request/Fields/ItemSubCategory.php b/app/Validators/Request/Fields/ItemSubcategory.php
similarity index 96%
rename from app/Validators/Request/Fields/ItemSubCategory.php
rename to app/Validators/Request/Fields/ItemSubcategory.php
index 70949ba7..b2b937a8 100644
--- a/app/Validators/Request/Fields/ItemSubCategory.php
+++ b/app/Validators/Request/Fields/ItemSubcategory.php
@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Validator as ValidatorFacade;
-use Illuminate\Validation\Rule;
 
 /**
  * Validation helper class for item sub category, returns the generated validator objects
@@ -16,7 +15,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategory extends BaseValidator
+class ItemSubcategory extends BaseValidator
 {
     private $category_id;
 
diff --git a/app/Validators/Request/Fields/ItemTypeAllocatedExpense.php b/app/Validators/Request/Fields/ItemType/AllocatedExpense.php
similarity index 94%
rename from app/Validators/Request/Fields/ItemTypeAllocatedExpense.php
rename to app/Validators/Request/Fields/ItemType/AllocatedExpense.php
index 3b158f08..82faee49 100644
--- a/app/Validators/Request/Fields/ItemTypeAllocatedExpense.php
+++ b/app/Validators/Request/Fields/ItemType/AllocatedExpense.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Validators\Request\Fields;
+namespace App\Validators\Request\Fields\ItemType;
 
 use App\Validators\Request\Fields\Validator as BaseValidator;
 use Illuminate\Contracts\Validation\Validator;
@@ -15,7 +15,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeAllocatedExpense extends BaseValidator
+class AllocatedExpense extends BaseValidator
 {
     /**
      * Return the validator object for the create request
diff --git a/app/Validators/Request/Fields/ItemTypeSimpleExpense.php b/app/Validators/Request/Fields/ItemType/SimpleExpense.php
similarity index 94%
rename from app/Validators/Request/Fields/ItemTypeSimpleExpense.php
rename to app/Validators/Request/Fields/ItemType/SimpleExpense.php
index 97719927..7aa96b69 100644
--- a/app/Validators/Request/Fields/ItemTypeSimpleExpense.php
+++ b/app/Validators/Request/Fields/ItemType/SimpleExpense.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Validators\Request\Fields;
+namespace App\Validators\Request\Fields\ItemType;
 
 use App\Validators\Request\Fields\Validator as BaseValidator;
 use Illuminate\Contracts\Validation\Validator;
@@ -15,7 +15,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemTypeSimpleExpense extends BaseValidator
+class SimpleExpense extends BaseValidator
 {
     /**
      * Return the validator object for the create request
diff --git a/app/Validators/Request/Fields/SubCategory.php b/app/Validators/Request/Fields/Subcategory.php
similarity index 98%
rename from app/Validators/Request/Fields/SubCategory.php
rename to app/Validators/Request/Fields/Subcategory.php
index 4eff3e7d..1bc8a01a 100644
--- a/app/Validators/Request/Fields/SubCategory.php
+++ b/app/Validators/Request/Fields/Subcategory.php
@@ -15,7 +15,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SubCategory extends BaseValidator
+class Subcategory extends BaseValidator
 {
     /**
      * Create the validation rules for the create (POST) request
diff --git a/app/Validators/Request/Parameters.php b/app/Validators/Request/Parameters.php
index 41a650ce..f6e6220d 100644
--- a/app/Validators/Request/Parameters.php
+++ b/app/Validators/Request/Parameters.php
@@ -3,9 +3,10 @@
 
 namespace App\Validators\Request;
 
+use App\Item\ItemInterfaceFactory;
 use App\Models\Category;
 use App\Models\ResourceType;
-use App\Models\SubCategory;
+use App\Models\Subcategory;
 use App\Utilities\General;
 
 /**
@@ -51,10 +52,13 @@ private static function find(array $parameter_names = [])
     }
 
     /**
-     * Validate the valid parameters array, checking the set value to see if it is
-     * valid, invalid values are silently removed from the collections array
+     * Validate the parameters array, check the set value to see if it is
+     * valid, invalid values are silently removed from the parameters array
+     *
+     * @param integer|null $resource_type_id
+     * @param integer|null $resource_id
      */
-    private static function validate()
+    private static function validate(?int $resource_type_id, ?int $resource_id)
     {
         foreach (array_keys(self::$parameters) as $key) {
             switch ($key) {
@@ -100,7 +104,7 @@ private static function validate()
                     if (array_key_exists($key, self::$parameters) === true) {
                         if (
                             array_key_exists('category', self::$parameters) === false ||
-                            (new SubCategory())->
+                            (new Subcategory())->
                             where('sub_category.id', '=', self::$parameters[$key])->
                             where('sub_category.category_id', '=', self::$parameters['category'])->
                             exists() === false
@@ -110,6 +114,7 @@ private static function validate()
                     }
                     break;
 
+                case 'categories':
                 case 'months':
                 case 'subcategories':
                 case 'years':
@@ -121,10 +126,24 @@ private static function validate()
                     break;
 
                 case 'year':
-                    if (array_key_exists($key, self::$parameters) === true) {
-                        if (intval(self::$parameters[$key]) < 2013 ||
-                            self::$parameters[$key] > intval(date('Y')) + 1) {
+                    $min_year_limit = intval(Date('Y'));
+                    $max_year_limit = intval(Date('Y'));
+
+                    if ($resource_type_id !== null && $resource_id === null) {
+                        $item_interface = ItemInterfaceFactory::resourceTypeItem($resource_type_id);
+                        $min_year_limit = $item_interface->conditionalParameterMinYear($resource_type_id);
+                        $max_year_limit = $item_interface->conditionalParameterMaxYear($resource_type_id);
+                    }
 
+                    if ($resource_type_id !== null && $resource_id !== null) {
+                        $item_interface = ItemInterfaceFactory::item($resource_type_id);
+                        $min_year_limit = $item_interface->conditionalParameterMinYear($resource_id);
+                        $max_year_limit = $item_interface->conditionalParameterMaxYear($resource_id);
+                    }
+
+                    if (array_key_exists($key, self::$parameters) === true) {
+                        if (intval(self::$parameters[$key]) < $min_year_limit ||
+                            self::$parameters[$key] > $max_year_limit + 1) {
                             unset(self::$parameters[$key]);
                         }
                     }
@@ -152,13 +171,19 @@ private static function validate()
      * Return all the valid collection parameters
      *
      * @param array $parameter_names
+     * @param integer|null $resource_type_id
+     * @param integer|null $resource_id
      *
      * @return array
      */
-    public static function fetch(array $parameter_names = []): array
+    public static function fetch(
+        array $parameter_names = [],
+        ?int $resource_type_id = null,
+        ?int $resource_id = null
+    ): array
     {
         self::find($parameter_names);
-        self::validate();
+        self::validate($resource_type_id, $resource_id);
 
         return self::$parameters;
     }
diff --git a/app/Validators/Request/Route.php b/app/Validators/Request/Route.php
index 84f48a88..be37688f 100644
--- a/app/Validators/Request/Route.php
+++ b/app/Validators/Request/Route.php
@@ -6,10 +6,11 @@
 use App\Validators\Request\Routes\Category;
 use App\Validators\Request\Routes\Item;
 use App\Validators\Request\Routes\ItemCategory;
-use App\Validators\Request\Routes\ItemSubCategory;
+use App\Validators\Request\Routes\ItemSubcategory;
+use App\Validators\Request\Routes\ItemType;
 use App\Validators\Request\Routes\Resource;
 use App\Validators\Request\Routes\ResourceType;
-use App\Validators\Request\Routes\SubCategory;
+use App\Validators\Request\Routes\Subcategory;
 use App\Utilities\Response as UtilityResponse;
 
 /**
@@ -81,7 +82,7 @@ static public function subcategory(
     {
         if ($manage === false) {
             if (
-                SubCategory::existsToUserForViewing(
+                Subcategory::existsToUserForViewing(
                     $resource_type_id,
                     $category_id,
                     $subcategory_id,
@@ -92,7 +93,7 @@ static public function subcategory(
             }
         } else {
             if (
-                SubCategory::existsToUserForManagement(
+                Subcategory::existsToUserForManagement(
                     (int) $resource_type_id,
                     (int) $category_id,
                     (int) $subcategory_id,
@@ -267,6 +268,21 @@ static public function itemCategory(
         }
     }
 
+    /**
+     * Validate the route, checks the route parameters based on the users
+     * permitted resource types
+     *
+     * (In this case that doesn't happen as anyone can see the item type)
+     *
+     * @param $item_type_id
+     */
+    static public function itemType($item_type_id)
+    {
+        if (ItemType::existsToUserForViewing((int) $item_type_id) === false) {
+            UtilityResponse::notFound(trans('entities.item-type'));
+        }
+    }
+
     /**
      * Validate the route, checks the route parameters based on the users
      * permitted resource types
@@ -290,7 +306,7 @@ static public function itemSubcategory(
     ) {
         if ($manage === false) {
             if (
-                ItemSubCategory::existsToUserForViewing(
+                ItemSubcategory::existsToUserForViewing(
                     (int) $resource_type_id,
                     (int) $resource_id,
                     (int) $item_id,
@@ -303,7 +319,7 @@ static public function itemSubcategory(
             }
         } else {
             if (
-                ItemSubCategory::existsToUserForManagement(
+                ItemSubcategory::existsToUserForManagement(
                     (int) $resource_type_id,
                     (int) $resource_id,
                     (int) $item_id,
diff --git a/app/Validators/Request/Routes/Category.php b/app/Validators/Request/Routes/Category.php
index 62ce520f..decc0247 100644
--- a/app/Validators/Request/Routes/Category.php
+++ b/app/Validators/Request/Routes/Category.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\Category as CategoryModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to a category
@@ -32,7 +32,7 @@ static public function existsToUserForViewing(
     {
         if (
             $category_id === 'nill' ||
-            (new CategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->categoryExistsToUser(
                 $resource_type_id,
                 $category_id,
                 $permitted_resource_types
@@ -62,7 +62,7 @@ static public function existsToUserForManagement(
     {
         if (
             $category_id === 'nill' ||
-            (new CategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->categoryExistsToUser(
                 $resource_type_id,
                 $category_id,
                 $permitted_resource_types,
diff --git a/app/Validators/Request/Routes/Item.php b/app/Validators/Request/Routes/Item.php
index 2076ccc8..65fda757 100644
--- a/app/Validators/Request/Routes/Item.php
+++ b/app/Validators/Request/Routes/Item.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\Item as ItemModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to an item
@@ -36,7 +36,7 @@ static public function existsToUserForViewing(
             $resource_type_id === 'nill' ||
             $resource_id === 'nill' ||
             $item_id === 'nill' ||
-            (new ItemModel())->existsToUser(
+            (new ResourceTypeAccess())->itemExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
@@ -71,7 +71,7 @@ static public function existsToUserForManagement(
             $resource_type_id === 'nill' ||
             $resource_id === 'nill' ||
             $item_id === 'nill' ||
-            (new ItemModel())->existsToUser(
+            (new ResourceTypeAccess())->itemExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
diff --git a/app/Validators/Request/Routes/ItemCategory.php b/app/Validators/Request/Routes/ItemCategory.php
index d4faf45c..a56554fb 100644
--- a/app/Validators/Request/Routes/ItemCategory.php
+++ b/app/Validators/Request/Routes/ItemCategory.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\ItemCategory as ItemCategoryModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to an item category
@@ -39,7 +39,7 @@ static public function existsToUserForViewing(
             $resource_id === 'nill' ||
             $item_id === 'nill' ||
             $item_category_id === 'nill' ||
-            (new ItemCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->itemCategoryExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
@@ -78,7 +78,7 @@ static public function existsToUserForManagement(
             $resource_id === 'nill' ||
             $item_id === 'nill' ||
             $item_category_id === 'nill' ||
-            (new ItemCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->itemCategoryExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
diff --git a/app/Validators/Request/Routes/ItemSubCategory.php b/app/Validators/Request/Routes/ItemSubcategory.php
similarity index 93%
rename from app/Validators/Request/Routes/ItemSubCategory.php
rename to app/Validators/Request/Routes/ItemSubcategory.php
index 8e646846..7ab2be41 100644
--- a/app/Validators/Request/Routes/ItemSubCategory.php
+++ b/app/Validators/Request/Routes/ItemSubcategory.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\ItemSubCategory as ItemSubCategoryModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to an item category
@@ -12,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class ItemSubCategory
+class ItemSubcategory
 {
     /**
      * Validate that the user is able to view the requested item subcategory
@@ -43,7 +43,7 @@ static public function existsToUserForViewing(
             $item_id === 'nill' ||
             $item_category_id === 'nill' ||
             $item_subcategory_id === 'nill' ||
-            (new ItemSubCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->itemSubcategoryExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
@@ -86,7 +86,7 @@ static public function existsToUserForManagement(
             $item_id === 'nill' ||
             $item_category_id === 'nill' ||
             $item_subcategory_id === 'nill' ||
-            (new ItemSubCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->itemSubcategoryExistsToUser(
                 $resource_type_id,
                 $resource_id,
                 $item_id,
diff --git a/app/Validators/Request/Routes/ItemType.php b/app/Validators/Request/Routes/ItemType.php
new file mode 100644
index 00000000..969a9dc0
--- /dev/null
+++ b/app/Validators/Request/Routes/ItemType.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Validators\Request\Routes;
+
+use App\Models\ResourceTypeAccess;
+
+/**
+ * Validate the route params to an item type
+ *
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright G3D Development Limited 2018-2019
+ * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
+ */
+class ItemType
+{
+    /**
+     * Validate that the user is able to view the requested item type
+     *
+     * @param string|int $item_type_id
+     *
+     * @return boolean
+     */
+    static public function existsToUserForViewing($item_type_id): bool
+    {
+        if (
+            $item_type_id === 'nill' ||
+            (new ResourceTypeAccess())->itemTypeExistsToUser($item_type_id) === false
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/Validators/Request/Routes/Resource.php b/app/Validators/Request/Routes/Resource.php
index 5120850f..2d1b1961 100644
--- a/app/Validators/Request/Routes/Resource.php
+++ b/app/Validators/Request/Routes/Resource.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\Resource as ResourceModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to a resource
@@ -33,7 +33,7 @@ static public function existsToUserForViewing(
         if (
             $resource_type_id === 'nill' ||
             $resource_id === 'nill' ||
-            (new ResourceModel())->existsToUser(
+            (new ResourceTypeAccess())->resourceExistsToUser(
                 $resource_id,
                 $resource_type_id,
                 $permitted_resource_types
@@ -64,7 +64,7 @@ static public function existsToUserForManagement(
         if (
             $resource_type_id === 'nill' ||
             $resource_id === 'nill' ||
-            (new ResourceModel())->existsToUser(
+            (new ResourceTypeAccess())->resourceExistsToUser(
                 $resource_id,
                 $resource_type_id,
                 $permitted_resource_types,
diff --git a/app/Validators/Request/Routes/ResourceType.php b/app/Validators/Request/Routes/ResourceType.php
index 30f4bcf4..e4b3833d 100644
--- a/app/Validators/Request/Routes/ResourceType.php
+++ b/app/Validators/Request/Routes/ResourceType.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\ResourceType as ResourceTypeModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to a resource type
@@ -30,7 +30,7 @@ static public function existsToUserForViewing(
     {
         if (
             $resource_type_id === 'nill' ||
-            (new ResourceTypeModel())->existsToUser(
+            (new ResourceTypeAccess())->resourceTypeExistsToUser(
                 $resource_type_id,
                 $permitted_resource_types
             ) === false
@@ -57,7 +57,7 @@ static public function existsToUserForManagement(
     {
         if (
             $resource_type_id === 'nill' ||
-            (new ResourceTypeModel())->existsToUser(
+            (new ResourceTypeAccess())->resourceTypeExistsToUser(
                 $resource_type_id,
                 $permitted_resource_types,
                 true
diff --git a/app/Validators/Request/Routes/SubCategory.php b/app/Validators/Request/Routes/Subcategory.php
similarity index 92%
rename from app/Validators/Request/Routes/SubCategory.php
rename to app/Validators/Request/Routes/Subcategory.php
index 38dd4dbb..a1d818d3 100644
--- a/app/Validators/Request/Routes/SubCategory.php
+++ b/app/Validators/Request/Routes/Subcategory.php
@@ -3,7 +3,7 @@
 
 namespace App\Validators\Request\Routes;
 
-use App\Models\SubCategory as SubCategoryModel;
+use App\Models\ResourceTypeAccess;
 
 /**
  * Validate the route params to a sub category
@@ -12,7 +12,7 @@
  * @copyright G3D Development Limited 2018-2019
  * @license https://github.com/costs-to-expect/api/blob/master/LICENSE
  */
-class SubCategory
+class Subcategory
 {
     /**
      * Validate that the user is able to view the requested subcategory based
@@ -36,7 +36,7 @@ static public function existsToUserForViewing(
             $resource_type_id === 'nill' ||
             $category_id === 'nill' ||
             $subcategory_id === 'nill' ||
-            (new SubCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->subcategoryExistsToUser(
                 $resource_type_id,
                 $category_id,
                 $subcategory_id,
@@ -71,7 +71,7 @@ static public function existsToUserForManagement(
             $resource_type_id === 'nill' ||
             $category_id === 'nill' ||
             $subcategory_id === 'nill' ||
-            (new SubCategoryModel())->existsToUser(
+            (new ResourceTypeAccess())->subcategoryExistsToUser(
                 $resource_type_id,
                 $category_id,
                 $subcategory_id,
diff --git a/config/api/hashids.php b/config/api/app/hashids.php
similarity index 65%
rename from config/api/hashids.php
rename to config/api/app/hashids.php
index 992cc9c4..9163adae 100644
--- a/config/api/hashids.php
+++ b/config/api/app/hashids.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     'min_length' => env('APP_HASH_MIN_LENGTH'),
     'category' => env('APP_HASH_SALT_CATEGORY'),
@@ -8,5 +10,7 @@
     'resource' => env('APP_HASH_SALT_RESOURCE'),
     'item' => env('APP_HASH_SALT_ITEM'),
     'item_category' => env('APP_HASH_SALT_ITEM_CATEGORY'),
-    'item_subcategory' => env('APP_HASH_SALT_ITEM_SUBCATEGORY')
+    'item_subcategory' => env('APP_HASH_SALT_ITEM_SUBCATEGORY'),
+    'item_type' => env('APP_HASH_SALT_ITEM_TYPE'),
+    'permitted_user' => env('APP_HASH_SALT_PERMITTED_USER')
 ];
diff --git a/config/api/app/pagination-parameters-including-collection.php b/config/api/app/pagination-parameters-including-collection.php
new file mode 100644
index 00000000..8014859c
--- /dev/null
+++ b/config/api/app/pagination-parameters-including-collection.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'offset' => [
+        'parameter' => 'offset',
+        'title' => 'app/pagination-parameters-including-collection.title-offset',
+        'description' => 'app/pagination-parameters-including-collection.description-offset',
+        'default' => 0,
+        'type' => 'integer',
+        'required' => false
+    ],
+    'limit' => [
+        'parameter' => 'limit',
+        'title' => 'app/pagination-parameters-including-collection.title-limit',
+        'description' => 'app/pagination-parameters-including-collection.description-limit',
+        'default' => 10,
+        'type' => 'integer',
+        'required' => false
+    ],
+    'collection' => [
+        'parameter' => 'collection',
+        'title' => 'app/pagination-parameters-including-collection.title-collection',
+        'description' => 'app/pagination-parameters-including-collection.description-collection',
+        'default' => false,
+        'type' => 'boolean',
+        'required' => false
+    ]
+];
diff --git a/config/api/pagination/parameters.php b/config/api/app/pagination-parameters.php
similarity index 54%
rename from config/api/pagination/parameters.php
rename to config/api/app/pagination-parameters.php
index 955a9878..109328b4 100644
--- a/config/api/pagination/parameters.php
+++ b/config/api/app/pagination-parameters.php
@@ -5,16 +5,16 @@
 return [
     'offset' => [
         'parameter' => 'offset',
-        'title' => 'pagination/parameters.title-offset',
-        'description' => 'pagination/parameters.description-offset',
+        'title' => 'app/pagination-parameters.title-offset',
+        'description' => 'app/pagination-parameters.description-offset',
         'default' => 0,
         'type' => 'integer',
         'required' => false
     ],
     'limit' => [
         'parameter' => 'limit',
-        'title' => 'pagination/parameters.title-limit',
-        'description' => 'pagination/parameters.description-limit',
+        'title' => 'app/pagination-parameters.title-limit',
+        'description' => 'app/pagination-parameters.description-limit',
         'default' => 10,
         'type' => 'integer',
         'required' => false
diff --git a/config/api/searchable/parameters.php b/config/api/app/searchable-parameters.php
similarity index 60%
rename from config/api/searchable/parameters.php
rename to config/api/app/searchable-parameters.php
index 1cf22543..63c4ebcf 100644
--- a/config/api/searchable/parameters.php
+++ b/config/api/app/searchable-parameters.php
@@ -5,8 +5,8 @@
 return [
     'search' => [
         "parameter" => "search",
-        "title" => 'searchable.title',
-        "description" => 'searchable.description',
+        "title" => 'app/searchable-parameters.title',
+        "description" => 'app/searchable-parameters.description',
         "default" => null,
         "type" => "string",
         "required" => false
diff --git a/config/api/sortable/parameters.php b/config/api/app/sortable-parameters.php
similarity index 60%
rename from config/api/sortable/parameters.php
rename to config/api/app/sortable-parameters.php
index e9200c76..885e4762 100644
--- a/config/api/sortable/parameters.php
+++ b/config/api/app/sortable-parameters.php
@@ -5,8 +5,8 @@
 return [
     'sort' => [
         "parameter" => "sort",
-        "title" => 'sortable.title',
-        "description" => 'sortable.description',
+        "title" => 'app/sortable-parameters.title',
+        "description" => 'app/sortable-parameters.description',
         "default" => null,
         "type" => "string",
         "required" => false
diff --git a/config/api/version.php b/config/api/app/version.php
similarity index 75%
rename from config/api/version.php
rename to config/api/app/version.php
index 63bbf55b..1ac9b95a 100644
--- a/config/api/version.php
+++ b/config/api/app/version.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 return [
-    'version'=> '2.02.0',
+    'version'=> '2.04.0',
     'prefix' => 'v2',
-    'release_date' => '2019-10-07',
+    'release_date' => '2019-11-xx',
     'changelog' => [
         'api' => '/v2/changelog',
         'markdown' => 'https://github.com/costs-to-expect/api/blob/master/CHANGELOG.md'
diff --git a/config/api/item-type-allocated-expense/parameters.php b/config/api/item-type-allocated-expense/parameters.php
index 3b84af18..b5524624 100644
--- a/config/api/item-type-allocated-expense/parameters.php
+++ b/config/api/item-type-allocated-expense/parameters.php
@@ -4,13 +4,43 @@
 
 return [
     'collection' => [
+        'include-categories' => [
+            'parameter' => 'include-categories',
+            'title' => 'item-type-allocated-expense/parameters.title-include-categories',
+            'description' => 'item-type-allocated-expense/parameters.description-include-categories',
+            'type' => 'boolean',
+            'required' => false
+        ],
+        'include-subcategories' => [
+            'parameter' => 'include-subcategories',
+            'title' => 'item-type-allocated-expense/parameters.title-include-subcategories',
+            'description' => 'item-type-allocated-expense/parameters.description-include-subcategories',
+            'type' => 'boolean',
+            'required' => false
+        ],
         'include-unpublished' => [
-            'field' => 'include-unpublished',
+            'parameter' => 'include-unpublished',
             'title' => 'item-type-allocated-expense/parameters.title-include-unpublished',
             'description' => 'item-type-allocated-expense/parameters.description-include-unpublished',
             'type' => 'boolean',
             'required' => false
         ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'item-type-allocated-expense/parameters.title-category',
+            "description" => 'item-type-allocated-expense/parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'item-type-allocated-expense/parameters.title-subcategory',
+            "description" => 'item-type-allocated-expense/parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
         'year' => [
             "parameter" => "year",
             "title" => 'item-type-allocated-expense/parameters.title-year',
diff --git a/config/api/item-type-allocated-expense/summary-parameters.php b/config/api/item-type-allocated-expense/summary-parameters.php
new file mode 100644
index 00000000..99209ebf
--- /dev/null
+++ b/config/api/item-type-allocated-expense/summary-parameters.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'include-unpublished' => [
+            'parameter' => 'include-unpublished',
+            'title' => 'item-type-allocated-expense/summary-parameters.title-include-unpublished',
+            'description' => 'item-type-allocated-expense/summary-parameters.description-include-unpublished',
+            'type' => 'boolean',
+            'required' => false
+        ],
+        'year' => [
+            "parameter" => "year",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-year',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-year',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'years' => [
+            "parameter" => "years",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-years',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-years',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'month' => [
+            "parameter" => "month",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-month',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-month',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'months' => [
+            "parameter" => "months",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-months',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-months',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-category',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'categories' => [
+            "parameter" => "categories",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-categories',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-categories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-subcategory',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategories' => [
+            "parameter" => "subcategories",
+            "title" => 'item-type-allocated-expense/summary-parameters.title-subcategories',
+            "description" => 'item-type-allocated-expense/summary-parameters.description-subcategories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/config/api/item/summary-searchable.php b/config/api/item-type-allocated-expense/summary-searchable.php
similarity index 100%
rename from config/api/item/summary-searchable.php
rename to config/api/item-type-allocated-expense/summary-searchable.php
diff --git a/config/api/item-type-simple-expense/parameters.php b/config/api/item-type-simple-expense/parameters.php
index 32502294..dc169aeb 100644
--- a/config/api/item-type-simple-expense/parameters.php
+++ b/config/api/item-type-simple-expense/parameters.php
@@ -4,6 +4,36 @@
 
 return [
     'collection' => [
+        'include-categories' => [
+            'parameter' => 'include-categories',
+            'title' => 'item-type-simple-expense/parameters.title-include-categories',
+            'description' => 'item-type-simple-expense/parameters.description-include-categories',
+            'type' => 'boolean',
+            'required' => false
+        ],
+        'include-subcategories' => [
+            'parameter' => 'include-subcategories',
+            'title' => 'item-type-simple-expense/parameters.title-include-subcategories',
+            'description' => 'item-type-simple-expense/parameters.description-include-subcategories',
+            'type' => 'boolean',
+            'required' => false
+        ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'item-type-simple-expense/parameters.title-category',
+            "description" => 'item-type-simple-expense/parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'item-type-simple-expense/parameters.title-subcategory',
+            "description" => 'item-type-simple-expense/parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
         'year' => [
             "parameter" => "year",
             "title" => 'item-type-simple-expense/parameters.title-year',
diff --git a/config/api/item-type-simple-expense/summary-parameters.php b/config/api/item-type-simple-expense/summary-parameters.php
new file mode 100644
index 00000000..fcd2d304
--- /dev/null
+++ b/config/api/item-type-simple-expense/summary-parameters.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'year' => [
+            "parameter" => "year",
+            "title" => 'item-type-simple-expense/summary-parameters.title-year',
+            "description" => 'item-type-simple-expense/summary-parameters.description-year',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'years' => [
+            "parameter" => "years",
+            "title" => 'item-type-simple-expense/summary-parameters.title-years',
+            "description" => 'item-type-simple-expense/summary-parameters.description-years',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'month' => [
+            "parameter" => "month",
+            "title" => 'item-type-simple-expense/summary-parameters.title-month',
+            "description" => 'item-type-simple-expense/summary-parameters.description-month',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'months' => [
+            "parameter" => "months",
+            "title" => 'item-type-simple-expense/summary-parameters.title-months',
+            "description" => 'item-type-simple-expense/summary-parameters.description-months',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'item-type-simple-expense/summary-parameters.title-category',
+            "description" => 'item-type-simple-expense/summary-parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'categories' => [
+            "parameter" => "categories",
+            "title" => 'item-type-simple-expense/summary-parameters.title-categories',
+            "description" => 'item-type-simple-expense/summary-parameters.description-categories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'item-type-simple-expense/summary-parameters.title-subcategory',
+            "description" => 'item-type-simple-expense/summary-parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategories' => [
+            "parameter" => "subcategories",
+            "title" => 'item-type-simple-expense/summary-parameters.title-subcategories',
+            "description" => 'item-type-simple-expense/summary-parameters.description-subcategories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/config/api/resource-type-item/summary-searchable.php b/config/api/item-type-simple-expense/summary-searchable.php
similarity index 100%
rename from config/api/resource-type-item/summary-searchable.php
rename to config/api/item-type-simple-expense/summary-searchable.php
diff --git a/config/api/item-type/searchable.php b/config/api/item-type/searchable.php
new file mode 100644
index 00000000..5ebb8cc8
--- /dev/null
+++ b/config/api/item-type/searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description'
+];
diff --git a/config/api/item-type/sortable.php b/config/api/item-type/sortable.php
new file mode 100644
index 00000000..4202d0b2
--- /dev/null
+++ b/config/api/item-type/sortable.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'description',
+    'created'
+];
diff --git a/config/api/item/parameters.php b/config/api/item/parameters.php
deleted file mode 100644
index a2b391b9..00000000
--- a/config/api/item/parameters.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'collection' => [
-        'include-categories' => [
-            'field' => 'include-categories',
-            'title' => 'item/parameters.title-include-categories',
-            'description' => 'item/parameters.description-include-categories',
-            'type' => 'boolean',
-            'required' => false
-        ],
-        'include-subcategories' => [
-            'field' => 'include-subcategories',
-            'title' => 'item/parameters.title-include-subcategories',
-            'description' => 'item/parameters.description-include-subcategories',
-            'type' => 'boolean',
-            'required' => false
-        ],
-        'category' => [
-            "parameter" => "category",
-            "title" => 'item/parameters.title-category',
-            "description" => 'item/parameters.description-category',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ],
-        'subcategory' => [
-            "parameter" => "subcategory",
-            "title" => 'item/parameters.title-subcategory',
-            "description" => 'item/parameters.description-subcategory',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ]
-    ],
-    'item' => []
-];
diff --git a/config/api/item/summary-parameters.php b/config/api/item/summary-parameters.php
deleted file mode 100644
index d3343a95..00000000
--- a/config/api/item/summary-parameters.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'collection' => [
-        'include-unpublished' => [
-            'field' => 'include-unpublished',
-            'title' => 'item/summary-parameters.title-include-unpublished',
-            'description' => 'item/summary-parameters.description-include-unpublished',
-            'type' => 'boolean',
-            'required' => false
-        ],
-        'year' => [
-            "parameter" => "year",
-            "title" => 'item/summary-parameters.title-year',
-            "description" => 'item/summary-parameters.description-year',
-            "default" => null,
-            "type" => "integer",
-            "required" => false
-        ],
-        'years' => [
-            "parameter" => "years",
-            "title" => 'item/summary-parameters.title-years',
-            "description" => 'item/summary-parameters.description-years',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'month' => [
-            "parameter" => "month",
-            "title" => 'item/summary-parameters.title-month',
-            "description" => 'item/summary-parameters.description-month',
-            "default" => null,
-            "type" => "integer",
-            "required" => false
-        ],
-        'months' => [
-            "parameter" => "months",
-            "title" => 'item/summary-parameters.title-months',
-            "description" => 'item/summary-parameters.description-months',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'category' => [
-            "parameter" => "category",
-            "title" => 'item/summary-parameters.title-category',
-            "description" => 'item/summary-parameters.description-category',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ],
-        'categories' => [
-            "parameter" => "categories",
-            "title" => 'item/summary-parameters.title-categories',
-            "description" => 'item/summary-parameters.description-categories',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'subcategory' => [
-            "parameter" => "subcategory",
-            "title" => 'item/summary-parameters.title-subcategory',
-            "description" => 'item/summary-parameters.description-subcategory',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ],
-        'subcategories' => [
-            "parameter" => "subcategories",
-            "title" => 'item/summary-parameters.title-subcategories',
-            "description" => 'item/summary-parameters.description-subcategories',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ]
-    ],
-    'item' => []
-];
diff --git a/config/api/pagination/parameters-including-collection.php b/config/api/pagination/parameters-including-collection.php
deleted file mode 100644
index f613022c..00000000
--- a/config/api/pagination/parameters-including-collection.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'offset' => [
-        'parameter' => 'offset',
-        'title' => 'pagination/parameters.title-offset',
-        'description' => 'pagination/parameters.description-offset',
-        'default' => 0,
-        'type' => 'integer',
-        'required' => false
-    ],
-    'limit' => [
-        'parameter' => 'limit',
-        'title' => 'pagination/parameters.title-limit',
-        'description' => 'pagination/parameters.description-limit',
-        'default' => 10,
-        'type' => 'integer',
-        'required' => false
-    ],
-    'collection' => [
-        'parameter' => 'collection',
-        'title' => 'pagination/parameters.title-collection',
-        'description' => 'pagination/parameters.description-collection',
-        'default' => false,
-        'type' => 'boolean',
-        'required' => false
-    ]
-];
diff --git a/config/api/permitted-user/fields.php b/config/api/permitted-user/fields.php
new file mode 100644
index 00000000..37e19ec4
--- /dev/null
+++ b/config/api/permitted-user/fields.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'user_id' => [
+        'field' => 'user_id',
+        'title' => 'permitted-user/fields.title-user_id',
+        'description' => 'permitted-user/fields.description-user_id',
+        'type' => 'string',
+        'validation' => [
+            'length' => 10
+        ],
+        'required' => true
+    ]
+];
diff --git a/config/api/permitted-user/searchable.php b/config/api/permitted-user/searchable.php
new file mode 100644
index 00000000..94996e23
--- /dev/null
+++ b/config/api/permitted-user/searchable.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'email'
+];
diff --git a/config/api/permitted-user/sortable.php b/config/api/permitted-user/sortable.php
new file mode 100644
index 00000000..485fd718
--- /dev/null
+++ b/config/api/permitted-user/sortable.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name',
+    'email',
+    'created'
+];
diff --git a/config/api/resource-type-item-type-allocated-expense/parameters.php b/config/api/resource-type-item-type-allocated-expense/parameters.php
index 01924f6e..9c96c2e9 100644
--- a/config/api/resource-type-item-type-allocated-expense/parameters.php
+++ b/config/api/resource-type-item-type-allocated-expense/parameters.php
@@ -5,54 +5,54 @@
 return [
     'collection' => [
         'include-categories' => [
-            'field' => 'include-categories',
-            'title' => 'resource-type-item/parameters.title-include-categories',
-            'description' => 'resource-type-item/parameters.description-include-categories',
+            'parameter' => 'include-categories',
+            'title' => 'resource-type-item-type-allocated-expense/parameters.title-include-categories',
+            'description' => 'resource-type-item-type-allocated-expense/parameters.description-include-categories',
             'type' => 'boolean',
             'required' => false
         ],
         'include-subcategories' => [
-            'field' => 'include-subcategories',
-            'title' => 'resource-type-item/parameters.title-include-subcategories',
-            'description' => 'resource-type-item/parameters.description-include-subcategories',
+            'parameter' => 'include-subcategories',
+            'title' => 'resource-type-item-type-allocated-expense/parameters.title-include-subcategories',
+            'description' => 'resource-type-item-type-allocated-expense/parameters.description-include-subcategories',
             'type' => 'boolean',
             'required' => false
         ],
         'include-unpublished' => [
-            'field' => 'include-unpublished',
-            'title' => 'resource-type-item/parameters.title-include-unpublished',
-            'description' => 'resource-type-item/parameters.description-include-unpublished',
+            'parameter' => 'include-unpublished',
+            'title' => 'resource-type-item-type-allocated-expense/parameters.title-include-unpublished',
+            'description' => 'resource-type-item-type-allocated-expense/parameters.description-include-unpublished',
             'type' => 'boolean',
             'required' => false
         ],
         'year' => [
             "parameter" => "year",
-            "title" => 'resource-type-item/parameters.title-year',
-            "description" => 'resource-type-item/parameters.description-year',
+            "title" => 'resource-type-item-type-allocated-expense/parameters.title-year',
+            "description" => 'resource-type-item-type-allocated-expense/parameters.description-year',
             "default" => null,
             "type" => "integer",
             "required" => false
         ],
         'month' => [
             "parameter" => "month",
-            "title" => 'resource-type-item/parameters.title-month',
-            "description" => 'resource-type-item/parameters.description-month',
+            "title" => 'resource-type-item-type-allocated-expense/parameters.title-month',
+            "description" => 'resource-type-item-type-allocated-expense/parameters.description-month',
             "default" => null,
             "type" => "integer",
             "required" => false
         ],
         'category' => [
             "parameter" => "category",
-            "title" => 'resource-type-item/parameters.title-category',
-            "description" => 'resource-type-item/parameters.description-category',
+            "title" => 'resource-type-item-type-allocated-expense/parameters.title-category',
+            "description" => 'resource-type-item-type-allocated-expense/parameters.description-category',
             "default" => null,
             "type" => "string",
             "required" => false
         ],
         'subcategory' => [
             "parameter" => "subcategory",
-            "title" => 'resource-type-item/parameters.title-subcategory',
-            "description" => 'resource-type-item/parameters.description-subcategory',
+            "title" => 'resource-type-item-type-allocated-expense/parameters.title-subcategory',
+            "description" => 'resource-type-item-type-allocated-expense/parameters.description-subcategory',
             "default" => null,
             "type" => "string",
             "required" => false
diff --git a/config/api/resource-type-item-type-allocated-expense/summary-parameters.php b/config/api/resource-type-item-type-allocated-expense/summary-parameters.php
new file mode 100644
index 00000000..518f92b1
--- /dev/null
+++ b/config/api/resource-type-item-type-allocated-expense/summary-parameters.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'include-unpublished' => [
+            'parameter' => 'include-unpublished',
+            'title' => 'resource-type-item-type-allocated-expense/summary-parameters.title-include-unpublished',
+            'description' => 'resource-type-item-type-allocated-expense/summary-parameters.description-include-unpublished',
+            'type' => 'boolean',
+            'required' => false
+        ],
+        'resources' => [
+            "parameter" => "resources",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-resources',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-resources',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'year' => [
+            "parameter" => "year",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-year',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-year',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'years' => [
+            "parameter" => "years",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-years',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-years',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'month' => [
+            "parameter" => "month",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-month',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-month',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'months' => [
+            "parameter" => "months",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-months',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-months',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-category',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'categories' => [
+            "parameter" => "categories",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-categories',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-categories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-subcategory',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategories' => [
+            "parameter" => "subcategories",
+            "title" => 'resource-type-item-type-allocated-expense/summary-parameters.title-subcategories',
+            "description" => 'resource-type-item-type-allocated-expense/summary-parameters.description-subcategories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/config/api/resource-type-item-type-allocated-expense/summary-searchable.php b/config/api/resource-type-item-type-allocated-expense/summary-searchable.php
new file mode 100644
index 00000000..1d5a028d
--- /dev/null
+++ b/config/api/resource-type-item-type-allocated-expense/summary-searchable.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'description'
+];
diff --git a/config/api/resource-type-item-type-simple-expense/parameters.php b/config/api/resource-type-item-type-simple-expense/parameters.php
index 718ac898..01b8b196 100644
--- a/config/api/resource-type-item-type-simple-expense/parameters.php
+++ b/config/api/resource-type-item-type-simple-expense/parameters.php
@@ -5,47 +5,47 @@
 return [
     'collection' => [
         'include-categories' => [
-            'field' => 'include-categories',
-            'title' => 'resource-type-item/parameters.title-include-categories',
-            'description' => 'resource-type-item/parameters.description-include-categories',
+            'parameter' => 'include-categories',
+            'title' => 'resource-type-item-type-simple-expense/parameters.title-include-categories',
+            'description' => 'resource-type-item-type-simple-expense/parameters.description-include-categories',
             'type' => 'boolean',
             'required' => false
         ],
         'include-subcategories' => [
-            'field' => 'include-subcategories',
-            'title' => 'resource-type-item/parameters.title-include-subcategories',
-            'description' => 'resource-type-item/parameters.description-include-subcategories',
+            'parameter' => 'include-subcategories',
+            'title' => 'resource-type-item-type-simple-expense/parameters.title-include-subcategories',
+            'description' => 'resource-type-item-type-simple-expense/parameters.description-include-subcategories',
             'type' => 'boolean',
             'required' => false
         ],
         'year' => [
             "parameter" => "year",
-            "title" => 'resource-type-item/parameters.title-year',
-            "description" => 'resource-type-item/parameters.description-year',
+            "title" => 'resource-type-item-type-simple-expense/parameters.title-year',
+            "description" => 'resource-type-item-type-simple-expense/parameters.description-year',
             "default" => null,
             "type" => "integer",
             "required" => false
         ],
         'month' => [
             "parameter" => "month",
-            "title" => 'resource-type-item/parameters.title-month',
-            "description" => 'resource-type-item/parameters.description-month',
+            "title" => 'resource-type-item-type-simple-expense/parameters.title-month',
+            "description" => 'resource-type-item-type-simple-expense/parameters.description-month',
             "default" => null,
             "type" => "integer",
             "required" => false
         ],
         'category' => [
             "parameter" => "category",
-            "title" => 'resource-type-item/parameters.title-category',
-            "description" => 'resource-type-item/parameters.description-category',
+            "title" => 'resource-type-item-type-simple-expense/parameters.title-category',
+            "description" => 'resource-type-item-type-simple-expense/parameters.description-category',
             "default" => null,
             "type" => "string",
             "required" => false
         ],
         'subcategory' => [
             "parameter" => "subcategory",
-            "title" => 'resource-type-item/parameters.title-subcategory',
-            "description" => 'resource-type-item/parameters.description-subcategory',
+            "title" => 'resource-type-item-type-simple-expense/parameters.title-subcategory',
+            "description" => 'resource-type-item-type-simple-expense/parameters.description-subcategory',
             "default" => null,
             "type" => "string",
             "required" => false
diff --git a/config/api/resource-type-item-type-simple-expense/summary-parameters.php b/config/api/resource-type-item-type-simple-expense/summary-parameters.php
new file mode 100644
index 00000000..cde320a4
--- /dev/null
+++ b/config/api/resource-type-item-type-simple-expense/summary-parameters.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'collection' => [
+        'resources' => [
+            "parameter" => "resources",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-resources',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-resources',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'year' => [
+            "parameter" => "year",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-year',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-year',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'years' => [
+            "parameter" => "years",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-years',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-years',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'month' => [
+            "parameter" => "month",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-month',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-month',
+            "default" => null,
+            "type" => "integer",
+            "required" => false
+        ],
+        'months' => [
+            "parameter" => "months",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-months',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-months',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'category' => [
+            "parameter" => "category",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-category',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-category',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'categories' => [
+            "parameter" => "categories",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-categories',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-categories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ],
+        'subcategory' => [
+            "parameter" => "subcategory",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-subcategory',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-subcategory',
+            "default" => null,
+            "type" => "string",
+            "required" => false
+        ],
+        'subcategories' => [
+            "parameter" => "subcategories",
+            "title" => 'resource-type-item-type-simple-expense/summary-parameters.title-subcategories',
+            "description" => 'resource-type-item-type-simple-expense/summary-parameters.description-subcategories',
+            "default" => false,
+            "type" => "boolean",
+            "required" => false
+        ]
+    ],
+    'item' => []
+];
diff --git a/config/api/resource-type-item-type-simple-expense/summary-searchable.php b/config/api/resource-type-item-type-simple-expense/summary-searchable.php
new file mode 100644
index 00000000..1d5a028d
--- /dev/null
+++ b/config/api/resource-type-item-type-simple-expense/summary-searchable.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'description'
+];
diff --git a/config/api/resource-type-item/summary-parameters.php b/config/api/resource-type-item/summary-parameters.php
deleted file mode 100644
index 0177d6d3..00000000
--- a/config/api/resource-type-item/summary-parameters.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'collection' => [
-        'include-unpublished' => [
-            'field' => 'include-unpublished',
-            'title' => 'resource-type-item/summary-parameters.title-include-unpublished',
-            'description' => 'resource-type-item/summary-parameters.description-include-unpublished',
-            'type' => 'boolean',
-            'required' => false
-        ],
-        'resources' => [
-            "parameter" => "resources",
-            "title" => 'resource-type-item/summary-parameters.title-resources',
-            "description" => 'resource-type-item/summary-parameters.description-resources',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'year' => [
-            "parameter" => "year",
-            "title" => 'resource-type-item/summary-parameters.title-year',
-            "description" => 'resource-type-item/summary-parameters.description-year',
-            "default" => null,
-            "type" => "integer",
-            "required" => false
-        ],
-        'years' => [
-            "parameter" => "years",
-            "title" => 'resource-type-item/summary-parameters.title-years',
-            "description" => 'resource-type-item/summary-parameters.description-years',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'month' => [
-            "parameter" => "month",
-            "title" => 'resource-type-item/summary-parameters.title-month',
-            "description" => 'resource-type-item/summary-parameters.description-month',
-            "default" => null,
-            "type" => "integer",
-            "required" => false
-        ],
-        'months' => [
-            "parameter" => "months",
-            "title" => 'resource-type-item/summary-parameters.title-months',
-            "description" => 'resource-type-item/summary-parameters.description-months',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'category' => [
-            "parameter" => "category",
-            "title" => 'resource-type-item/summary-parameters.title-category',
-            "description" => 'resource-type-item/summary-parameters.description-category',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ],
-        'categories' => [
-            "parameter" => "categories",
-            "title" => 'resource-type-item/summary-parameters.title-categories',
-            "description" => 'resource-type-item/summary-parameters.description-categories',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ],
-        'subcategory' => [
-            "parameter" => "subcategory",
-            "title" => 'resource-type-item/summary-parameters.title-subcategory',
-            "description" => 'resource-type-item/summary-parameters.description-subcategory',
-            "default" => null,
-            "type" => "string",
-            "required" => false
-        ],
-        'subcategories' => [
-            "parameter" => "subcategories",
-            "title" => 'resource-type-item/summary-parameters.title-subcategories',
-            "description" => 'resource-type-item/summary-parameters.description-subcategories',
-            "default" => false,
-            "type" => "boolean",
-            "required" => false
-        ]
-    ],
-    'item' => []
-];
diff --git a/public/css/app.css b/public/css/app.css
index d5ff9b64..791e046d 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -7,7 +7,6 @@ a,
 a:focus,
 a:hover {
     color: #d0378b;
-    font-weight: bold;
 }
 
 /* Custom default button */
@@ -25,9 +24,8 @@ a:hover {
  * Base structure
  */
 
-html,
-body {
-    height: 100%;
+html, body
+{
     background-color: #64317a;
 }
 
@@ -35,15 +33,14 @@ body {
     display: -ms-flexbox;
     display: flex;
     color: #fff;
-    text-shadow: 0 .05rem .1rem rgba(0, 0, 0, .5);
-    box-shadow: inset 0 0 5rem rgba(0, 0, 0, .5);
 }
 
 .cover-container {
     max-width: 42em;
 }
 .cover-heading {
-    font-size: 3.5rem;
+    margin-top: 3rem;
+    font-size: 3rem;
 }
 
 
@@ -96,11 +93,6 @@ body {
 .cover {
     padding: 0 1.5rem;
 }
-.cover .btn-lg {
-    padding: .75rem 1.25rem;
-    font-weight: 700;
-}
-
 
 /*
  * Footer
diff --git a/resources/lang/en/pagination/parameters.php b/resources/lang/en/app/pagination-parameters-including-collection.php
similarity index 100%
rename from resources/lang/en/pagination/parameters.php
rename to resources/lang/en/app/pagination-parameters-including-collection.php
diff --git a/resources/lang/en/app/pagination-parameters.php b/resources/lang/en/app/pagination-parameters.php
new file mode 100644
index 00000000..4ed1c9f6
--- /dev/null
+++ b/resources/lang/en/app/pagination-parameters.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-offset' => 'Offset',
+    'description-offset' => 'Start result for pagination',
+
+    'title-limit' => 'Limit',
+    'description-limit' => 'Number of results to return'
+];
diff --git a/resources/lang/en/searchable.php b/resources/lang/en/app/searchable-parameters.php
similarity index 100%
rename from resources/lang/en/searchable.php
rename to resources/lang/en/app/searchable-parameters.php
diff --git a/resources/lang/en/sortable.php b/resources/lang/en/app/sortable-parameters.php
similarity index 100%
rename from resources/lang/en/sortable.php
rename to resources/lang/en/app/sortable-parameters.php
diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 29bd0e87..063c3ae6 100644
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -9,5 +9,6 @@
     'subcategory' => 'Subcategory',
     'item' => 'Item (Expense)',
     'item-category' => 'Assigned Category',
-    'item-subcategory' => 'Assigned Subcategory'
+    'item-subcategory' => 'Assigned Subcategory',
+    'item-type' => 'Item type'
 ];
diff --git a/resources/lang/en/item-type-allocated-expense/allowed-values.php b/resources/lang/en/item-type-allocated-expense/allowed-values.php
index 774f7829..b329cbad 100644
--- a/resources/lang/en/item-type-allocated-expense/allowed-values.php
+++ b/resources/lang/en/item-type-allocated-expense/allowed-values.php
@@ -3,6 +3,12 @@
 declare(strict_types=1);
 
 return [
+    'description-prefix-category' => 'Include results with items assigned to \'',
+    'description-suffix-category' => '\' category',
+
+    'description-prefix-subcategory' => 'Include results with items assigned to \'',
+    'description-suffix-subcategory' => '\' subcategory',
+
     'description-prefix-year' => 'Include results with effective date in ',
 
     'description-prefix-month' => 'Include results with effective date in ',
diff --git a/resources/lang/en/item-type-allocated-expense/parameters.php b/resources/lang/en/item-type-allocated-expense/parameters.php
index 2574d6b7..4b03babb 100644
--- a/resources/lang/en/item-type-allocated-expense/parameters.php
+++ b/resources/lang/en/item-type-allocated-expense/parameters.php
@@ -3,6 +3,18 @@
 declare(strict_types=1);
 
 return [
+    'title-include-categories' => 'Include assigned category?',
+    'description-include-categories' => 'Optionally include the category assigned to each item',
+
+    'title-include-subcategories' => 'Include assigned subcategory?',
+    'description-include-subcategories' => 'Optionally include the subcategory assigned to each item, include-categories must be set',
+
+    'title-category' => 'Category',
+    'description-category' => 'Show results for the requested category',
+
+    'title-subcategory' => 'Subcategory',
+    'description-subcategory' => 'Show results for the requested subcategory, only applicable if category provided',
+
     'title-include-unpublished' => 'Include unpublished expenses?',
     'description-include-unpublished' => 'Optionally include any unpublished expenses',
 
diff --git a/resources/lang/en/item/summary-parameters.php b/resources/lang/en/item-type-allocated-expense/summary-parameters.php
similarity index 100%
rename from resources/lang/en/item/summary-parameters.php
rename to resources/lang/en/item-type-allocated-expense/summary-parameters.php
diff --git a/resources/lang/en/item-type-simple-expense/allowed-values.php b/resources/lang/en/item-type-simple-expense/allowed-values.php
new file mode 100644
index 00000000..b329cbad
--- /dev/null
+++ b/resources/lang/en/item-type-simple-expense/allowed-values.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'description-prefix-category' => 'Include results with items assigned to \'',
+    'description-suffix-category' => '\' category',
+
+    'description-prefix-subcategory' => 'Include results with items assigned to \'',
+    'description-suffix-subcategory' => '\' subcategory',
+
+    'description-prefix-year' => 'Include results with effective date in ',
+
+    'description-prefix-month' => 'Include results with effective date in ',
+];
diff --git a/resources/lang/en/item-type-simple-expense/parameters.php b/resources/lang/en/item-type-simple-expense/parameters.php
index 8f80e708..238fd260 100644
--- a/resources/lang/en/item-type-simple-expense/parameters.php
+++ b/resources/lang/en/item-type-simple-expense/parameters.php
@@ -3,6 +3,18 @@
 declare(strict_types=1);
 
 return [
+    'title-include-categories' => 'Include assigned category?',
+    'description-include-categories' => 'Optionally include the category assigned to each item',
+
+    'title-include-subcategories' => 'Include assigned subcategory?',
+    'description-include-subcategories' => 'Optionally include the subcategory assigned to each item, include-categories must be set',
+
+    'title-category' => 'Category',
+    'description-category' => 'Show results for the requested category',
+
+    'title-subcategory' => 'Subcategory',
+    'description-subcategory' => 'Show results for the requested subcategory, only applicable if category provided',
+
     'title-year' => 'Year',
     'description-year' => 'Show results for the requested year',
 
diff --git a/resources/lang/en/item-type-simple-expense/summary-parameters.php b/resources/lang/en/item-type-simple-expense/summary-parameters.php
new file mode 100644
index 00000000..b16d03fe
--- /dev/null
+++ b/resources/lang/en/item-type-simple-expense/summary-parameters.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-year' => 'Year',
+    'description-year' => 'Return the items summary for the requested year',
+
+    'title-years' => 'Years',
+    'description-years' => 'Return the items summary grouped by years',
+
+    'title-month' => 'Month',
+    'description-month' => 'Return the items summary for the requested month, only applicable if year option set',
+
+    'title-months' => 'Months',
+    'description-months' => 'Return the items summary grouped by month, only applicable if year option set',
+
+    'title-category' => 'Category',
+    'description-category' => 'Return the items summary for the requested category',
+
+    'title-categories' => 'Categories',
+    'description-categories' => 'Return the items summary grouped by category',
+
+    'title-subcategory' => 'Subcategory',
+    'description-subcategory' => 'Return the items summary for the requested subcategory, only applicable if category option set',
+
+    'title-subcategories' => 'Subcategories',
+    'description-subcategories' => 'Return the items summary grouped by subcategory, only applicable if category option set',
+];
diff --git a/resources/lang/en/item/parameters.php b/resources/lang/en/item/parameters.php
deleted file mode 100644
index 08b563c4..00000000
--- a/resources/lang/en/item/parameters.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'title-include-categories' => 'Include assigned category?',
-    'description-include-categories' => 'Optionally include the category assigned to each item',
-
-    'title-include-subcategories' => 'Include assigned subcategory?',
-    'description-include-subcategories' => 'Optionally include the subcategory assigned to each item, include-categories must be set',
-
-    'title-category' => 'Category',
-    'description-category' => 'Show results for the requested category',
-
-    'title-subcategory' => 'Subcategory',
-    'description-subcategory' => 'Show results for the requested subcategory, only applicable if category provided',
-];
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
deleted file mode 100644
index d4814118..00000000
--- a/resources/lang/en/pagination.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Pagination Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used by the paginator library to build
-    | the simple pagination links. You are free to change them to anything
-    | you want to customize your views to better match your application.
-    |
-    */
-
-    'previous' => '&laquo; Previous',
-    'next' => 'Next &raquo;',
-
-];
diff --git a/resources/lang/en/permitted-user/fields.php b/resources/lang/en/permitted-user/fields.php
new file mode 100644
index 00000000..3245ab7c
--- /dev/null
+++ b/resources/lang/en/permitted-user/fields.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-user_id' => 'User Id',
+    'description-user_id' => 'The user to assign to the resource type'
+];
diff --git a/resources/lang/en/resource-type-item/allowed-values.php b/resources/lang/en/resource-type-item-type-allocated-expense/allowed-values.php
similarity index 100%
rename from resources/lang/en/resource-type-item/allowed-values.php
rename to resources/lang/en/resource-type-item-type-allocated-expense/allowed-values.php
diff --git a/resources/lang/en/resource-type-item-type-allocated-expense/parameters.php b/resources/lang/en/resource-type-item-type-allocated-expense/parameters.php
index a3ce6062..e1264d4f 100644
--- a/resources/lang/en/resource-type-item-type-allocated-expense/parameters.php
+++ b/resources/lang/en/resource-type-item-type-allocated-expense/parameters.php
@@ -3,6 +3,24 @@
 declare(strict_types=1);
 
 return [
+    'title-include-categories' => 'Include assigned category?',
+    'description-include-categories' => 'Optionally include the category assigned to each item',
+
+    'title-include-subcategories' => 'Include assigned subcategory?',
+    'description-include-subcategories' => 'Optionally include the subcategory assigned to each item, include-categories must be set',
+
     'title-include-unpublished' => 'Include unpublished expenses?',
-    'description-include-unpublished' => 'Optionally include any unpublished expenses'
+    'description-include-unpublished' => 'Optionally include any unpublished expenses',
+
+    'title-year' => 'Year',
+    'description-year' => 'Show results for the requested year',
+
+    'title-month' => 'Month',
+    'description-month' => 'Show results fo the requested month',
+
+    'title-category' => 'Category',
+    'description-category' => 'Show results for the requested category',
+
+    'title-subcategory' => 'Subcategory',
+    'description-subcategory' => 'Show results for the requested subcategory, only applicable if category provided',
 ];
diff --git a/resources/lang/en/resource-type-item/summary-parameters.php b/resources/lang/en/resource-type-item-type-allocated-expense/summary-parameters.php
similarity index 100%
rename from resources/lang/en/resource-type-item/summary-parameters.php
rename to resources/lang/en/resource-type-item-type-allocated-expense/summary-parameters.php
diff --git a/resources/lang/en/item/allowed-values.php b/resources/lang/en/resource-type-item-type-simple-expense/allowed-values.php
similarity index 67%
rename from resources/lang/en/item/allowed-values.php
rename to resources/lang/en/resource-type-item-type-simple-expense/allowed-values.php
index c5eb5cfa..d21aab5e 100644
--- a/resources/lang/en/item/allowed-values.php
+++ b/resources/lang/en/resource-type-item-type-simple-expense/allowed-values.php
@@ -3,6 +3,10 @@
 declare(strict_types=1);
 
 return [
+    'description-prefix-year' => 'Include results with effective date in ',
+
+    'description-prefix-month' => 'Include results with effective date in ',
+
     'description-prefix-category' => 'Include results with items assigned to \'',
     'description-suffix-category' => '\' category',
 
diff --git a/resources/lang/en/resource-type-item/parameters.php b/resources/lang/en/resource-type-item-type-simple-expense/parameters.php
similarity index 84%
rename from resources/lang/en/resource-type-item/parameters.php
rename to resources/lang/en/resource-type-item-type-simple-expense/parameters.php
index e1264d4f..f7a0435d 100644
--- a/resources/lang/en/resource-type-item/parameters.php
+++ b/resources/lang/en/resource-type-item-type-simple-expense/parameters.php
@@ -9,9 +9,6 @@
     'title-include-subcategories' => 'Include assigned subcategory?',
     'description-include-subcategories' => 'Optionally include the subcategory assigned to each item, include-categories must be set',
 
-    'title-include-unpublished' => 'Include unpublished expenses?',
-    'description-include-unpublished' => 'Optionally include any unpublished expenses',
-
     'title-year' => 'Year',
     'description-year' => 'Show results for the requested year',
 
diff --git a/resources/lang/en/resource-type-item-type-simple-expense/summary-parameters.php b/resources/lang/en/resource-type-item-type-simple-expense/summary-parameters.php
new file mode 100644
index 00000000..662d3665
--- /dev/null
+++ b/resources/lang/en/resource-type-item-type-simple-expense/summary-parameters.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'title-resources' => 'Resource',
+    'description-resources' => 'Return the items summary grouped by resource',
+
+    'title-year' => 'Year',
+    'description-year' => 'Return the items summary for the requested year',
+
+    'title-years' => 'Years',
+    'description-years' => 'Return the items summary grouped by years',
+
+    'title-month' => 'Month',
+    'description-month' => 'Return the items summary for the requested month, only applicable if year option set',
+
+    'title-months' => 'Months',
+    'description-months' => 'Return the items summary grouped by month, only applicable if year option set',
+
+    'title-category' => 'Category',
+    'description-category' => 'Return the items summary for the requested category',
+
+    'title-categories' => 'Categories',
+    'description-categories' => 'Return the items summary grouped by category',
+
+    'title-subcategory' => 'Subcategory',
+    'description-subcategory' => 'Return the items summary for the requested subcategory, only applicable if category option set',
+
+    'title-subcategories' => 'Subcategories',
+    'description-subcategories' => 'Return the items summary grouped by subcategory, only applicable if category option set',
+];
diff --git a/resources/lang/en/route-descriptions.php b/resources/lang/en/route-descriptions.php
index fc0d23bf..32f67af2 100644
--- a/resources/lang/en/route-descriptions.php
+++ b/resources/lang/en/route-descriptions.php
@@ -18,6 +18,9 @@
     'sub_category_PATCH' => 'Update the selected subcategory',
     'sub_category_DELETE' => 'Delete the selected subcategory',
 
+    'item_type_GET_index' => 'Return all the item types supported in the API',
+    'item_type_GET_show' => 'Return the selected item type',
+
     'resource_type_GET_index' => 'Return all the public resource types, optionally, with authorisation include any private resource types',
     'resource_type_GET_show' => 'Return the selected resource type',
     'resource_type_POST' => 'Create a new resource type',
@@ -52,6 +55,9 @@
 
     'item_transfer_POST' => 'Transfer an item to another resource',
 
+    'permitted_user_GET_index' => 'Return the permitted users',
+    'permitted_user_POST' => 'Assign a permitted user',
+
     'request_GET_access-log' => 'Return the access log, read requests',
     'request_GET_error_log' => 'Return the error log',
     'request_POST' => 'Create an error log report',
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 77418c16..49eeaba2 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -37,31 +37,32 @@ function gtag(){dataLayer.push(arguments);}
         gtag('config', 'UA-64736-10');
     </script>
 </head>
-    <body class="text-center">
+    <body>
 
     <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
         <header class="masthead mb-auto">
             <div class="inner">
-                <h3 class="masthead-brand">Costs to Expect</h3>
+                <h3 class="masthead-brand d-none d-sm-none d-md-block">Costs to Expect</h3>
                 <nav class="nav nav-masthead justify-content-center">
                     <a class="nav-link" href="https://www.costs-to-expect.com">Website</a>
-                    <a class="nav-link" href="#">App (Coming soon!)</a>
+                    <a class="nav-link" href="#">App (Soon!)</a>
                     <a class="nav-link" href="/v2">API</a>
                     <a class="nav-link" href="/v2/changelog">Changelog</a>
                 </nav>
             </div>
         </header>
 
+        <a href="https://github.com/costs-to-expect/api" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+
         @yield('content')
 
-        <footer class="mastfoot mt-auto">
+        <footer class="mastfoot mt-auto text-center">
             <div class="inner">
                 <p>Copyright &copy; <a href="https://www.g3d-development.com">G3D Development Limited</a> 2018-{{ date('Y') }}</p>
                 <p>All code maintained by <a href="https://www.deanblackborough.com">Dean Blackborough</a> and licensed under MIT.</p>
             </div>
         </footer>
     </div>
-
         <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
         <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 9f917d8a..28ea58a4 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -3,31 +3,44 @@
 @section('content')
 
     <main role="main" class="inner cover">
-        <h1 class="cover-heading">Costs to Expect API</h1>
+        <h1 class="cover-heading text-center">Costs to Expect API</h1>
         @if ($maintenance === true)
         <div class="alert alert-info" role="alert">
             The Costs to Expect API is down for maintenance, we should be back online soon.
         </div>
         @endif
-        <p class="lead">This <a href="https://github.com/costs-to-expect/api/blob/master/LICENSE">Open Source</a>
-            API is the <a href="https://github.com/costs-to-expect/api">API</a> for the
-            <a href="https://www.costs-to-expect.com">Costs to Expect</a> service,
-            a small part of the service is a long-term personal project, my wife
-            and I are tracking the expenses to raise our two children to
-            adulthood, 18.</p>
-        <p class="lead">
-            <a href="/v2" class="btn btn-lg btn-primary mb-1">The API</a>&nbsp;
-            <a href="https://www.costs-to-expect.com" class="btn btn-lg btn-primary mb-1">The Website</a>
-        </p>
-        <p class="lead">
-            <a href="https://github.com/costs-to-expect" class="btn btn-lg btn-primary">GitHub</a>
+
+        <p class="lead mb-5">
+            Costs to Expect is a service that primarily focuses on providing tools
+            for tracking and forecasting expenses. Long-term the service will not be
+            limited to expenses; initially, however, expenses are the primary focus.
+            There are three parts to the service, the Open Source
+            <a href="https://github.com/costs-to-expect/api">API</a>, the
+            app and the <a href="https://www.costs-to-expect.com">website</a>.
         </p>
 
-        <p><small>Latest release: {{ $version }} ({{ $date }})</small></p>
+        <ul class="mb-5">
+            <li>The API is the backbone of the service; it is
+                <a href="https://github.com/costs-to-expect/api/blob/master/LICENSE">Open Source</a>
+                and available under the MIT license.</li>
+            <li>The <a href="https://www.costs-to-expect.com">website</a> is a
+                long-term personal project; my wife and I are tracking the expenses
+                to raise our two children to adulthood, 18.</li>
+            <li>The app is going to be the public side of the service; we are
+                hoping to have a version ready by the end of the year.</li>
+        </ul>
 
-        <p class="mt-4">This Laravel app is a RESTful API and is part of the
-            <a href="https://www.costs-to-expect.com">Costs to Expect</a> service.
+        <p class="text-center mt-3">
+            <a href="/v2" class="btn btn-md btn-primary">Access the API</a>
+            <a href="https://www.costs-to-expect.com" class="btn btn-md btn-primary">The Website</a>
+        </p>
+        <p class="text-center">
+            <a href="https://github.com/costs-to-expect" class="btn btn-md btn-primary">The API on GitHub</a>
+            <a href="#" class="btn btn-dm btn-primary disabled">The app</a>
         </p>
+
+        <p class="text-center"><small>Latest release: {{ $version }} ({{ $date }})</small></p>
+
     </main>
 
 @endsection
diff --git a/routes/api/auth.php b/routes/api/auth.php
index 3be77a77..d07beb05 100644
--- a/routes/api/auth.php
+++ b/routes/api/auth.php
@@ -3,9 +3,24 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 
-Route::post('auth/login', 'PassportController@login')->prefix(Config::get('api.version.prefix'));
-Route::post('auth/user', 'PassportController@user')->prefix(Config::get('api.version.prefix'));
-/**
- * Disabled because there are only currently going to be two users
- */
-// Route::post('auth/register', 'PassportController@register')->prefix(Config::get('api.version.prefix'));
+Route::group(
+    [
+        'prefix' => Config::get('api.app.version.prefix'),
+    ],
+    function () {
+        Route::post(
+            'auth/login',
+            'PassportController@login'
+        );
+
+        Route::post(
+            'auth/user',
+            'PassportController@user'
+        );
+
+        Route::post(
+            'auth/register',
+            'PassportController@register'
+        );
+    }
+);
diff --git a/routes/api/private-routes.php b/routes/api/private-routes.php
index 2ba975a4..7bdc2358 100644
--- a/routes/api/private-routes.php
+++ b/routes/api/private-routes.php
@@ -5,7 +5,7 @@
 
 Route::group(
     [
-        'prefix' => Config::get('api.version.prefix'),
+        'prefix' => Config::get('api.app.version.prefix'),
         'middleware' => [
             'auth:api',
             'convert.route.parameters'
@@ -49,7 +49,7 @@ function () {
 
         Route::post(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
-            'ItemSubCategoryController@create'
+            'ItemSubcategoryController@create'
         );
 
         Route::post(
@@ -89,7 +89,7 @@ function () {
 
         Route::delete(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
-            'ItemSubCategoryController@delete'
+            'ItemSubcategoryController@delete'
         );
 
         Route::patch(
diff --git a/routes/api/public-routes.php b/routes/api/public-routes.php
index e1745519..5457cfd5 100644
--- a/routes/api/public-routes.php
+++ b/routes/api/public-routes.php
@@ -5,7 +5,7 @@
 
 Route::group(
     [
-        'prefix' => Config::get('api.version.prefix'),
+        'prefix' => Config::get('api.app.version.prefix'),
         'middleware' => [
             'convert.route.parameters',
             'convert.get.parameters',
@@ -34,6 +34,26 @@ function () {
             'IndexController@optionsChangeLog'
         );
 
+        Route::get(
+            'item-types',
+            'ItemTypeController@index'
+        );
+
+        Route::options(
+            'item-types',
+            'ItemTypeController@optionsIndex'
+        );
+
+        Route::get(
+            'item-types/{item_type_id}',
+            'ItemTypeController@show'
+        );
+
+        Route::options(
+            'item-types/{item_type_id}',
+            'ItemTypeController@optionsShow'
+        );
+
         Route::get(
             'resource-types',
             'ResourceTypeController@index'
@@ -54,6 +74,16 @@ function () {
             'ResourceTypeController@optionsShow'
         );
 
+        Route::get(
+            'resource-types/{resource_type_id}/permitted-users',
+            'PermittedUserController@index'
+        );
+
+        Route::options(
+            'resource-types/{resource_type_id}/permitted-users',
+            'PermittedUserController@optionsIndex'
+        );
+
         Route::get(
             'resource-types/{resource_type_id}/categories',
             'CategoryController@index'
@@ -171,22 +201,22 @@ function () {
 
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
-            'ItemSubCategoryController@index'
+            'ItemSubcategoryController@index'
         );
 
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory',
-            'ItemSubCategoryController@optionsIndex'
+            'ItemSubcategoryController@optionsIndex'
         );
 
         Route::get(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
-            'ItemSubCategoryController@show'
+            'ItemSubcategoryController@show'
         );
 
         Route::options(
             'resource-types/{resource_type_id}/resources/{resource_id}/items/{item_id}/category/{item_category_id}/subcategory/{item_subcategory_id}',
-            'ItemSubCategoryController@optionsShow'
+            'ItemSubcategoryController@optionsShow'
         );
 
         // Request access and error logs
diff --git a/routes/api/public-summary-routes.php b/routes/api/public-summary-routes.php
index 94171a01..7cabdd47 100644
--- a/routes/api/public-summary-routes.php
+++ b/routes/api/public-summary-routes.php
@@ -5,7 +5,7 @@
 
 Route::group(
     [
-        'prefix' => Config::get('api.version.prefix'),
+        'prefix' => Config::get('api.app.version.prefix'),
         'middleware' => [
             'convert.route.parameters',
             'convert.get.parameters',
@@ -16,72 +16,72 @@ function () {
 
         Route::get(
             'summary/resource-types',
-            'SummaryResourceTypeController@index'
+            'Summary\ResourceTypeController@index'
         );
 
         Route::options(
             'summary/resource-types',
-            'SummaryResourceTypeController@optionsIndex'
+            'Summary\ResourceTypeController@optionsIndex'
         );
 
         Route::get(
             'summary/resource-types/{resource_type_id}/categories',
-            'SummaryCategoryController@index'
+            'Summary\CategoryController@index'
         );
 
         Route::options(
             'summary/resource-types/{resource_type_id}/categories',
-            'SummaryCategoryController@optionsIndex'
+            'Summary\CategoryController@optionsIndex'
         );
 
         Route::get(
             'summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories',
-            'SummarySubcategoryController@index'
+            'Summary\SubcategoryController@index'
         );
 
         Route::options(
             'summary/resource-types/{resource_type_id}/categories/{category_id}/subcategories',
-            'SummarySubcategoryController@optionsIndex'
+            'Summary\SubcategoryController@optionsIndex'
         );
 
         Route::get(
             'summary/resource-types/{resource_type_id}/resources',
-            'SummaryResourceController@index'
+            'Summary\ResourceController@index'
         );
 
         Route::options(
             'summary/resource-types/{resource_type_id}/resources',
-            'SummaryResourceController@optionsIndex'
+            'Summary\ResourceController@optionsIndex'
         );
 
         Route::get(
             'summary/resource-types/{resource_type_id}/items',
-            'SummaryResourceTypeItemController@index'
+            'Summary\ResourceTypeItemController@index'
         );
 
         Route::options(
             'summary/resource-types/{resource_type_id}/items',
-            'SummaryResourceTypeItemController@optionsIndex'
+            'Summary\ResourceTypeItemController@optionsIndex'
         );
 
         Route::get(
             'summary/resource-types/{resource_type_id}/resources/{resource_id}/items',
-            'SummaryItemController@index'
+            'Summary\ItemController@index'
         );
 
         Route::options(
             'summary/resource-types/{resource_type_id}/resources/{resource_id}/items',
-            'SummaryItemController@optionsIndex'
+            'Summary\ItemController@optionsIndex'
         );
 
         Route::get(
             'summary/request/access-log',
-            'SummaryRequestController@AccessLog'
+            'Summary\RequestController@AccessLog'
         );
 
         Route::options(
             'summary/request/access-log',
-            'SummaryRequestController@optionsAccessLog'
+            'Summary\RequestController@optionsAccessLog'
         );
     }
 );
diff --git a/routes/web.php b/routes/web.php
index 48945e3f..7f81f7df 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,13 +14,15 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 
+$version = Config::get('api.app.version');
+
 Route::view(
     '',
     'welcome',
     [
         'maintenance' => app()->isDownForMaintenance(),
-        'version' => Config::get('api.version.version'),
-        'date' => Config::get('api.version.release_date')
+        'version' => $version['version'],
+        'date' => $version['release_date']
     ]
 );