diff --git a/src/core.test.ts.md b/src/core.test.ts.md
index 744bb8f..f5f423f 100644
--- a/src/core.test.ts.md
+++ b/src/core.test.ts.md
@@ -49,11 +49,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported(NotImported ni) external {␊
+        function $_testNotImported(NotImported ni) external payable {␊
             super._testNotImported(ni);␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -84,7 +84,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x) Parent1(x) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -137,7 +137,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x) Parent1(x) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -150,7 +150,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y) Parent1(x) Parent2(y) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -163,7 +163,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y) Parent1(x) Parent2(y) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
         constructor(uint256 x, uint256 y, uint256 z, uint256 c) Parent1(x) Parent2(y) Parent3(z) Child4(c) payable {␊
         }␊
     ␊
-        function $_testParent1() external {␊
+        function $_testParent1() external payable {␊
             super._testParent1();␊
         }␊
     ␊
@@ -211,11 +211,11 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -232,19 +232,19 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -261,27 +261,27 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__C_init() external {␊
+        function $__C_init() external payable {␊
             super.__C_init();␊
         }␊
     ␊
-        function $__C_init_unchained() external {␊
+        function $__C_init_unchained() external payable {␊
             super.__C_init_unchained();␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -298,11 +298,11 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -319,19 +319,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -348,19 +348,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -437,15 +437,15 @@ Generated by [AVA](https://avajs.dev).
             (ret0) = super._testStructStorageInput($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_S(uint256 t) external {␊
+        function $_testClash_S(uint256 t) external payable {␊
             super._testClash($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_Z(uint256 t) external {␊
+        function $_testClash_Z(uint256 t) external payable {␊
             super._testClash($v_Z[t]);␊
         }␊
     ␊
-        function $_testUDVT(Integer i) external {␊
+        function $_testUDVT(Integer i) external payable {␊
             super._testUDVT(i);␊
         }␊
     ␊
@@ -514,15 +514,15 @@ Generated by [AVA](https://avajs.dev).
             (ret0) = super._testStructStorageInput($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_S(uint256 t) external {␊
+        function $_testClash_S(uint256 t) external payable {␊
             super._testClash($v_S[t]);␊
         }␊
     ␊
-        function $_testClash_Z(uint256 t) external {␊
+        function $_testClash_Z(uint256 t) external payable {␊
             super._testClash($v_Z[t]);␊
         }␊
     ␊
-        function $_testUDVT(Integer i) external {␊
+        function $_testUDVT(Integer i) external payable {␊
             super._testUDVT(i);␊
         }␊
     ␊
@@ -602,15 +602,15 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testEnumType(Enum e) external {␊
+        function $_testEnumType(Enum e) external payable {␊
             super._testEnumType(e);␊
         }␊
     ␊
-        function $_testContractType(Types t) external {␊
+        function $_testContractType(Types t) external payable {␊
             super._testContractType(t);␊
         }␊
     ␊
-        function $_testMappingType(uint256 m) external {␊
+        function $_testMappingType(uint256 m) external payable {␊
             super._testMappingType($v_mapping_uint256_uint256_[m]);␊
         }␊
     ␊
@@ -641,7 +641,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -654,7 +654,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -667,7 +667,7 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_chained() external {␊
+        function $_chained() external payable {␊
             super._chained();␊
         }␊
     ␊
@@ -731,27 +731,27 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $incrementInternal() external returns (uint256 ret0) {␊
+        function $incrementInternal() external payable returns (uint256 ret0) {␊
             (ret0) = super.incrementInternal();␊
             emit return$incrementInternal(ret0);␊
         }␊
     ␊
-        function $someOverloaded(uint256 arg0) external returns (bool ret0) {␊
+        function $someOverloaded(uint256 arg0) external payable returns (bool ret0) {␊
             (ret0) = super.someOverloaded(arg0);␊
             emit return$someOverloaded_uint256(ret0);␊
         }␊
     ␊
-        function $someOverloaded(bytes32 arg0) external returns (bool ret0) {␊
+        function $someOverloaded(bytes32 arg0) external payable returns (bool ret0) {␊
             (ret0) = super.someOverloaded(arg0);␊
             emit return$someOverloaded_bytes32(ret0);␊
         }␊
     ␊
-        function $dynamicReturnType() external returns (string memory ret0) {␊
+        function $dynamicReturnType() external payable returns (string memory ret0) {␊
             (ret0) = super.dynamicReturnType();␊
             emit return$dynamicReturnType(ret0);␊
         }␊
     ␊
-        function $multipleReturns(uint256 x) external returns (uint256 ret0, bytes32 ret1) {␊
+        function $multipleReturns(uint256 x) external payable returns (uint256 ret0, bytes32 ret1) {␊
             (ret0, ret1) = super.multipleReturns(x);␊
             emit return$multipleReturns(ret0, ret1);␊
         }␊
@@ -772,11 +772,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_testNotImported(NotImported ni) external {␊
+        function $_testNotImported(NotImported ni) external payable {␊
             super._testNotImported(ni);␊
         }␊
     ␊
-        function $_testNotImported2(NotImported2 ni) external {␊
+        function $_testNotImported2(NotImported2 ni) external payable {␊
             super._testNotImported2(ni);␊
         }␊
     ␊
@@ -865,11 +865,11 @@ Generated by [AVA](https://avajs.dev).
         constructor() payable {␊
         }␊
     ␊
-        function $_a_HasEnum(HasEnum arg0) external {␊
+        function $_a_HasEnum(HasEnum arg0) external payable {␊
             super._a(arg0);␊
         }␊
     ␊
-        function $_a_HasReceiveFunction(HasReceiveFunction arg0) external {␊
+        function $_a_HasReceiveFunction(HasReceiveFunction arg0) external payable {␊
             super._a(arg0);␊
         }␊
     ␊
@@ -907,11 +907,11 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -929,19 +929,19 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -960,27 +960,27 @@ Generated by [AVA](https://avajs.dev).
             return $a;␊
         }␊
     ␊
-        function $__C_init() external {␊
+        function $__C_init() external payable {␊
             super.__C_init();␊
         }␊
     ␊
-        function $__C_init_unchained() external {␊
+        function $__C_init_unchained() external payable {␊
             super.__C_init_unchained();␊
         }␊
     ␊
-        function $__B_init(uint256 b) external {␊
+        function $__B_init(uint256 b) external payable {␊
             super.__B_init(b);␊
         }␊
     ␊
-        function $__B_init_unchained(uint256 b) external {␊
+        function $__B_init_unchained(uint256 b) external payable {␊
             super.__B_init_unchained(b);␊
         }␊
     ␊
-        function $__A_init(uint256 a) external {␊
+        function $__A_init(uint256 a) external payable {␊
             super.__A_init(a);␊
         }␊
     ␊
-        function $__A_init_unchained(uint256 a) external {␊
+        function $__A_init_unchained(uint256 a) external payable {␊
             super.__A_init_unchained(a);␊
         }␊
     ␊
@@ -998,11 +998,11 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1021,19 +1021,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1051,19 +1051,19 @@ Generated by [AVA](https://avajs.dev).
             return $x;␊
         }␊
     ␊
-        function $__Y_init() external {␊
+        function $__Y_init() external payable {␊
             super.__Y_init();␊
         }␊
     ␊
-        function $__Y_init_unchained() external {␊
+        function $__Y_init_unchained() external payable {␊
             super.__Y_init_unchained();␊
         }␊
     ␊
-        function $__X_init(uint256 x) external {␊
+        function $__X_init(uint256 x) external payable {␊
             super.__X_init(x);␊
         }␊
     ␊
-        function $__X_init_unchained(uint256 x) external {␊
+        function $__X_init_unchained(uint256 x) external payable {␊
             super.__X_init_unchained(x);␊
         }␊
     ␊
@@ -1143,11 +1143,11 @@ Generated by [AVA](https://avajs.dev).
           constructor() payable {␊
           }␊
       ␊
-          function $_testNotImported(NotImported ni) external {␊
+          function $_testNotImported(NotImported ni) external payable {␊
               super._testNotImported(ni);␊
           }␊
       ␊
-          function $_testNotImported2(NotImported2 ni) external {␊
+          function $_testNotImported2(NotImported2 ni) external payable {␊
               super._testNotImported2(ni);␊
           }␊
       ␊
diff --git a/src/core.test.ts.snap b/src/core.test.ts.snap
index 642ca28..c84c667 100644
Binary files a/src/core.test.ts.snap and b/src/core.test.ts.snap differ
diff --git a/src/core.ts b/src/core.ts
index 2534717..0937a82 100644
--- a/src/core.ts
+++ b/src/core.ts
@@ -217,14 +217,12 @@ function getExposedContent(ast: SourceUnit, relativizePath: (p: string) => strin
                 'external',
               ];
 
-              if (fn.stateMutability !== 'nonpayable') {
-                if (fn.stateMutability === 'pure' && fnArgs.some(a => a.storageVar)) {
-                  header.push('view');
-                } else {
-                  header.push(fn.stateMutability);
-                }
-              } else if (isLibrary) {
+              if (fn.stateMutability === 'nonpayable') {
                 header.push('payable');
+              } else if (fn.stateMutability === 'pure' && fnArgs.some(a => a.storageVar)) {
+                header.push('view');
+              } else {
+                header.push(fn.stateMutability);
               }
 
               if (fn.returnParameters.parameters.length > 0) {