diff --git a/initdb/02_5_signalk_api_deps.sql b/initdb/02_5_signalk_api_deps.sql
index 3d72424..3fc4e09 100644
--- a/initdb/02_5_signalk_api_deps.sql
+++ b/initdb/02_5_signalk_api_deps.sql
@@ -10,17 +10,29 @@ select current_database();
 
 -- List vessel
 --TODO add geojson with position
-CREATE OR REPLACE VIEW api.vessel_view AS
+DROP VIEW IF EXISTS api.vessels_view;
+CREATE OR REPLACE VIEW api.vessels_view AS
     SELECT
         v.name as name,
         v.mmsi as mmsi,
         v.created_at as created_at,
-        m.time as last_contact
+        coalesce(m.time, null) as last_contact
         FROM auth.vessels v, api.metadata m
         WHERE
             m.mmsi = current_setting('vessel.mmsi')
+            AND m.mmsi = v.mmsi
             AND lower(v.owner_email) = lower(current_setting('request.jwt.claims', true)::json->>'email');
 
+DROP VIEW IF EXISTS api.vessel_p_view;
+CREATE OR REPLACE VIEW api.vessel_p_view AS
+    SELECT
+        v.name as name,
+        v.mmsi as mmsi,
+        v.created_at as created_at,
+        null as last_contact
+        FROM auth.vessels v
+        WHERE lower(v.owner_email) = lower(current_setting('request.jwt.claims', true)::json->>'email');
+
 -- Or function?
 DROP FUNCTION IF EXISTS api.vessel_fn;
 CREATE OR REPLACE FUNCTION api.vessel_fn(OUT vessel JSON) RETURNS JSON
@@ -41,6 +53,7 @@ AS $vessel$
 			            t.*
 			            FROM (
 			                ( select
+                                current_setting('vessel.name') as name,
 			                    time,
 			                    courseovergroundtrue,
 			                    speedoverground,
@@ -65,11 +78,16 @@ COMMENT ON FUNCTION
 
 -- Export user settings
 DROP FUNCTION IF EXISTS api.settings_fn;
-CREATE FUNCTION api.settings_fn(OUT settings JSON) RETURNS JSON AS $user_settings$
+CREATE FUNCTION api.settings_fn(out settings json) RETURNS JSON
+AS $user_settings$
     BEGIN
-        select first,last,preferences,created_at INTO settings
+       select row_to_json(row)::json INTO settings
+		from (
+		    select email,first,last,preferences,created_at,
+                INITCAP(CONCAT (LEFT(first, 1), ' ', last)) AS username
             from auth.accounts
-            where lower(email) = lower(current_setting('request.jwt.claims', true)::json->>'email');
+            where lower(email) = lower(current_setting('request.jwt.claims', true)::json->>'email')
+		) row;
     END;
 $user_settings$ language plpgsql security definer;
 
@@ -77,3 +95,35 @@ $user_settings$ language plpgsql security definer;
 COMMENT ON FUNCTION
     api.settings_fn
     IS 'Expose user settings to API';
+
+DROP FUNCTION IF EXISTS api.versions_fn;
+CREATE OR REPLACE FUNCTION api.versions_fn() RETURNS JSON
+AS $version$
+	DECLARE
+		_appv TEXT;
+		_sysv TEXT;
+    BEGIN
+        SELECT
+            value, version() into _appv,_sysv
+        FROM app_settings
+        WHERE name = 'app.version';
+        RETURN json_build_object('app_version', _appv,
+                           'sys_version', _sysv);
+    END;
+$version$ language plpgsql security definer;
+-- Description
+COMMENT ON FUNCTION
+    api.versions_fn
+    IS 'Expose function app and system version to API';
+
+DROP VIEW IF EXISTS api.versions_view;
+CREATE OR REPLACE VIEW api.versions_view AS
+    SELECT
+        value as app_version,
+        version() as sys_version
+    FROM app_settings
+    WHERE name = 'app.version';
+-- Description
+COMMENT ON VIEW
+    api.versions_view
+    IS 'Expose view app and system version to API';