diff --git a/meltano.yml b/meltano.yml
index a32bb4b..0cfe3da 100644
--- a/meltano.yml
+++ b/meltano.yml
@@ -5,9 +5,7 @@ plugins:
   extractors:
   - name: tap-athena
     namespace: tap_athena
-    # TODO: To test using Meltano, replace with absolute path
-    #       to the tap-athena.sh script:
-    executable: ./tap-athena.sh
+    executable: -e .
     capabilities:
     - state
     - catalog
@@ -16,9 +14,11 @@ plugins:
     #   start_date: '2010-01-01T00:00:00Z'
     settings:
     - name: aws_access_key_id
-      kind: password
+      kind: string
+      sensitive: true
     - name: aws_secret_access_key
-      kind: password
+      kind: string
+      sensitive: true
     - name: aws_region
       kind: string
     - name: s3_staging_dir
diff --git a/tap_athena/tap.py b/tap_athena/tap.py
index 3e8d0ab..00da623 100644
--- a/tap_athena/tap.py
+++ b/tap_athena/tap.py
@@ -19,30 +19,37 @@ class TapAthena(SQLTap):
             "aws_access_key_id",
             th.StringType,
             required=True,
+            secret=True,
+            title="AWS Access Key ID",
             description="AWS access key ID",
         ),
         th.Property(
             "aws_secret_access_key",
             th.StringType,
             required=True,
+            secret=True,
+            title="AWS Secret Access Key",
             description="AWS secret access key",
         ),
         th.Property(
             "aws_region",
             th.StringType,
             required=True,
-            description="AWS region",
+            title="AWS region",
+            description="The AWS region",
         ),
         th.Property(
             "s3_staging_dir",
             th.StringType,
             required=True,
+            title="S3 staging directory",
             description="The S3 staging directory where output is written.",
         ),
         th.Property(
             "schema_name",
             th.StringType,
             required=True,
+            title="Schema Name",
             description="Athena schema name",
         ),
     ).to_dict()